Merge revisions 35747:35930 from trunk.

svn path=/branches/kill-bonobo/; revision=35931
author: Matthew Barnes <mbarnes@src.gnome.org> 2008-08-08 12:26:12 +0800
committer: Matthew Barnes <mbarnes@src.gnome.org> 2008-08-08 12:26:12 +0800
commit: cea054cd54d84479352a43bbabc19c9ce9af5efb (patch)
tree: ba02763209ba0f22989024004f57689071603ec5 /po
parent: 91a6b6899e5568ed34f913bedb538dd6c9e35b32 (diff)
download: gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar
gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.gz
gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.bz2
gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.lz
gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.xz
gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.zst
gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.zip
15 files changed, 53988 insertions, 26686 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 0a5f0951fc..405b8fcc4d 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,120 @@
+2008-08-07  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-08-07  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	 gl.po: Updated Galician translation
+
+2008-08-06  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-08-06  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Abou Manal.
+
+2008-08-05: Sweta Kothari  <swkothar@redhat.com>
+
+	* gu.po: Committed Gujarati Translation.
+
+2008-08-04  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	 gl.po: Updated Galician translation
+
+2008-08-03  Leonid Kanter <leon@asplinux.ru>
+
+	 ru.po: Updated Russian translation
+
+2008-08-02  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	 gl.po: Updated Galician translation
+
+2008-08-01  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	 gl.po: Updated Galician translation
+
+2008-08-01  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	 gl.po: Updated Galician translation
+
+2008-07-31  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation by Frco. Javier Rial Rodríguez.
+
+2008-07-29  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-07-29  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2008-07-29  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Abou Manal.
+
+2008-07-27  Petr Kovar  <pknbe@volny.cz>
+
+	* cs.po: Fixed Czech translation.
+
+2008-07-24  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Terminology fixes by Fabrício Godoy.
+
+2008-06-24  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-07-24  Claude Paroz  <claude@2xlibre.net>
+
+	* fr.po: Updated French translation by Bruno Brouard and Claude Paroz.
+
+2008-07-23  Gil Forcada  <gforcada@gnome.org>
+
+	* ps.po: Added Pashto translation by Zabeeh Khan.
+	* LINGUAS: Added ps.
+
+2008-07-23  Petr Kovar  <pknbe@volny.cz>
+
+	* cs.po: Fixed Czech translation, thanks for noticing
+	to Pavel Sefranek.
+
+2008-07-21  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-07-21  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation.
+
+2008-07-21  Johnny Jacob  <jjohnny@novell.com>
+
+	* POTFILES.in: Fixed a typo.
+
+2008-07-21  J0hnny Jacob <jjohnny@novell.com>
+
+	* POTFILES.in: Updated file lsit.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* POTFILES.in: Updated file list.
+
+2008-07-20  Bharath Acharya  <abharath@novell.com>
+
+	* POTFILES.in:
+	Updated file-list for templates plugin.
+
+	** See bug #200147
+
+2008-07-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org> 
+
+	* es.po: Updated Spanish translation  
+
+2008-07-19  Andre Klapper  <a9016009@gmx.de>
+
+	* de.po: Updated German translation.
+
 2008-07-09  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation
diff --git a/po/LINGUAS b/po/LINGUAS
index bc3a9515ad..3e7692ebf5 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -56,6 +56,7 @@ oc
 or
 pa
 pl
+ps
 pt
 pt_BR
 ro
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6f5e114929..c9704dbb75 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -290,6 +290,7 @@ plugins/default-mailer/org-gnome-default-mailer.error.xml
 plugins/default-source/default-source.c
 plugins/default-source/org-gnome-default-source.eplug.xml
 plugins/email-custom-header/email-custom-header.c
+plugins/email-custom-header/email-custom-header.glade
 plugins/email-custom-header/org-gnome-email-custom-header.glade
 plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml
 plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
@@ -332,6 +333,7 @@ plugins/face/org-gnome-face.eplug.xml
 plugins/folder-unsubscribe/folder-unsubscribe.c
 plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
 plugins/google-account-setup/google-source.c
+plugins/google-account-setup/google-contacts-source.c
 plugins/google-account-setup/org-gnome-evolution-google.eplug.xml
 plugins/groupwise-account-setup/camel-gw-listener.c
 plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
@@ -415,17 +417,21 @@ plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml
 plugins/startup-wizard/startup-wizard.c
 plugins/subject-thread/org-gnome-subject-thread.eplug.xml
 plugins/subject-thread/subject-thread.c
+plugins/templates/apps-evolution-template-placeholders.schemas.in
+plugins/templates/templates.c
+plugins/templates/templates.glade
+plugins/templates/org-gnome-templates.eplug.xml
 plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml
+plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml
+plugins/webdav-account-setup/webdav-contacts-source.c
 shell/GNOME_Evolution_Shell.server.in.in
 shell/test/GNOME_Evolution_Test.server.in.in
 shell/apps_evolution_shell.schemas.in
 shell/e-active-connection-dialog.glade
 shell/e-component-registry.c
 shell/e-config-upgrade.c
-shell/e-shell-folder-title-bar.c
 shell/e-shell-importer.c
 shell/e-shell-settings-dialog.c
-shell/e-shell-utils.c
 shell/e-shell-view.c
 shell/e-shell-window-commands.c
 shell/e-shell-window.c
@@ -449,15 +455,11 @@ smime/lib/e-pkcs12.c
 tools/killev.c
 ui/evolution-addressbook.xml
 ui/evolution-calendar.xml
-ui/evolution-editor.xml
-ui/evolution-event-editor.xml
 ui/evolution-mail-global.xml
 ui/evolution-mail-list.xml
 ui/evolution-mail-message.xml
 ui/evolution-mail-messagedisplay.xml
-ui/evolution-memo-editor.xml
 ui/evolution-memos.xml
-ui/evolution-task-editor.xml
 ui/evolution-tasks.xml
 ui/evolution.xml
 views/addressbook/galview.xml
@@ -493,6 +495,7 @@ widgets/misc/e-filter-bar.c
 widgets/misc/e-filter-bar.h
 widgets/misc/e-image-chooser.c
 widgets/misc/e-map.c
+widgets/misc/e-online-button.c
 widgets/misc/e-pilot-settings.c
 widgets/misc/e-reflow.c
 widgets/misc/e-search-bar.c
diff --git a/po/ar.po b/po/ar.po
index 2f3322bffb..026b3a6a58 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-11 22:24+0100\n"
+"POT-Creation-Date: 2008-08-06 09:16+0100\n"
 "PO-Revision-Date: 2008-02-23 05:56+0100\n"
 "Last-Translator: Abou Manal <aboumanal@gmail.com>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -105,7 +105,7 @@ msgstr "موعد جديد"
 
 #: ../a11y/calendar/ea-cal-view.c:303
 msgid "New All Day Event"
-msgstr "حدث جديد يستغرق يوماً بأكمله"
+msgstr "حدث جديد يستغرق يومًا بأكمله"
 
 #: ../a11y/calendar/ea-cal-view.c:304
 msgid "New Meeting"
@@ -166,7 +166,7 @@ msgid "calendar view for one or more days"
 msgstr "مشهد التقويم ليوم أو أكثر"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:758
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -177,7 +177,7 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
+#: ../calendar/gui/calendar-component.c:761
 #: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
 #: ../calendar/gui/e-week-view-main-item.c:340
 msgid "%a %d %b"
@@ -186,9 +186,9 @@ msgstr "%a %d %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:768
+#: ../calendar/gui/calendar-component.c:770
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -196,10 +196,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:797
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -209,7 +209,7 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:787
 #: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
 #: ../calendar/gui/e-week-view-main-item.c:354
 msgid "%d %b"
@@ -262,7 +262,7 @@ msgstr "نافذة منبثقة"
 #. action name
 #: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
-msgstr "قم بإظهار تابعاً منبثقاً"
+msgstr "قم بإظهار تابعًا منبثقًا"
 
 #: ../a11y/e-table/gal-a11y-e-cell-text.c:614
 msgid "edit"
@@ -351,9 +351,10 @@ msgstr "نشّط"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
+#, fuzzy
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr ""
 "'{0}' مصدر دفتر عناوين مقروء فقط. انتقل إلى مشهد المراسلين واختر دفتر عناوين "
 "يقبل المراسلين. ."
@@ -400,12 +401,13 @@ msgid "Could not remove addressbook."
 msgstr "لم أستطع إزالة دفتر العناوين."
 
 #: ../addressbook/addressbook.error.xml.h:11
+#, fuzzy
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
-"لا يمكنك النفاذ إلا إلى دفتر عناوين نظام GroupWise حالياً من إيفليوشن. الرجاء "
+"لا يمكنك النفاذ إلا إلى دفتر عناوين نظام GroupWise حاليًا من إيفليوشن. الرجاء "
 "استخدام عميل بريد GroupWise آخر مرة واحدة، للوصول لمراسلي GroupWise "
 "المتكررين ومجلدات مراسلين GroupWise الشخصيين."
 
@@ -524,8 +526,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:35
 #, fuzzy
-msgid ""
-"You do not have enough permissions to delete contact in this Address Book."
+msgid "You do not have permission to delete contacts in this address book."
 msgstr "ليست لديك تصاريح كافية لحذف هذا البريد."
 
 #: ../addressbook/addressbook.error.xml.h:36
@@ -564,7 +565,7 @@ msgstr "است_خدمه كما هو"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -606,7 +607,7 @@ msgstr "إضبط التكملة التلقائية هنا"
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1334
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:396
+#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
@@ -653,8 +654,9 @@ msgstr "أدر شهادات S/Mime الخاصة بك هنا"
 #: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:311
-#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1455
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "على هذا الحاسوب"
 
@@ -667,47 +669,36 @@ msgstr "على هذا الحاسوب"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:485
-#: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1055
+#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "شخصي"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "على خواديم LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
-msgid "_Contact"
-msgstr "_مراسَل"
-
 #: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
-msgstr "أنشيء مراسَل جديد"
-
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgid "Contact _List"
-msgstr "_قائمة مراسَلين"
+msgstr "أنشئ مراسَل جديد"
 
 #: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
-msgstr "أنشيء قائمة مراسَلين جديدة"
+msgstr "أنشئ قائمة مراسَلين جديدة"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
 #: ../addressbook/gui/component/addressbook-config.c:1192
 msgid "New Address Book"
 msgstr "دفتر عناوين جديد"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgid "Address _Book"
-msgstr "_دفتر العناوين"
-
 #: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
-msgstr "أنشيء دفتر عناوين جديد"
+msgstr "أنشئ دفتر عناوين جديد"
 
 #: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
@@ -733,7 +724,7 @@ msgstr "انسخ محتويات الدفتر محليا للتعامل دون ا
 #: ../calendar/gui/dialogs/calendar-setup.c:377
 #: ../calendar/gui/dialogs/calendar-setup.c:388
 #: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2366
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "عام"
@@ -754,12 +745,12 @@ msgstr "التوثق"
 
 #: ../addressbook/gui/component/addressbook-config.c:977
 #: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "تفاصيل"
 
 #: ../addressbook/gui/component/addressbook-config.c:978
-#: ../mail/em-folder-browser.c:959
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "يجري البحث"
 
@@ -773,12 +764,12 @@ msgid "Address Book Properties"
 msgstr "خصائص دفتر العناوين"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "يجري الترقية..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "يجري ترقية `%s':"
@@ -830,7 +821,7 @@ msgid ""
 msgstr ""
 "سجل تغير تزامن بالم وملفات الخرائط لإيفُليوشن قد تغيرت.\n"
 "\n"
-"رجاءً كن صابراً ريثما يقوم إيفُليوشن بتهجير بيانات تزامن بايلوت الخاص بك..."
+"رجاءً كن صابرًا ريثما يقوم إيفُليوشن بتهجير بيانات تزامن بايلوت الخاص بك..."
 
 #: ../addressbook/gui/component/addressbook-view.c:430
 #: ../mail/em-folder-utils.c:503
@@ -858,11 +849,11 @@ msgstr "احفظ كـ vCard..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
+#: ../calendar/gui/calendar-component.c:620
+#: ../calendar/gui/e-calendar-table.c:1596
 #: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2090 ../mail/em-folder-view.c:1345
+#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -988,7 +979,7 @@ msgstr "أضف دفتر عناوين"
 #: ../addressbook/gui/component/ldap-config.glade.h:12
 #: ../mail/em-account-editor.c:761
 msgid "Always"
-msgstr "دائماً"
+msgstr "دائمًا"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
@@ -1022,7 +1013,7 @@ msgstr "سجّل _دخول:"
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../mail/em-account-editor.c:760
 msgid "Never"
-msgstr "أبداً"
+msgstr "أبدًا"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
@@ -1091,7 +1082,7 @@ msgid ""
 "vulnerable to security exploits."
 msgstr ""
 "إنتقاء هذا الخيار يعني أن خادومك لا يدعم SSL ولا TLS. هذا يعني أن إتّصالك لن "
-"يكون آمناً، وأنّك ستكون معرّضاً لمخاطر أمنيَّة."
+"يكون آمنًا، وأنّك ستكون معرّضًا لمخاطر أمنيَّة."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Sub"
@@ -1116,7 +1107,7 @@ msgid ""
 "root of the directory tree."
 msgstr ""
 "قاعدة البحث هي الاسم المميّز (DN) للمدخل الذي تبدأ عنده بحوثك. إن تركت هذا "
-"فارغاً، سيبدأ البحث عند جذر شجرة الأدلّة."
+"فارغًا، سيبدأ البحث عند جذر شجرة الأدلّة."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
@@ -1140,7 +1131,7 @@ msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
-"هذا هو العدد الأقصى للمدخلات لتنزيلها. تحديد هذا العدد برقم كبير جداً سوف "
+"هذا هو العدد الأقصى للمدخلات لتنزيلها. تحديد هذا العدد برقم كبير جدًا سوف "
 "يبطئ دفتر عناوينك."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
@@ -1179,7 +1170,7 @@ msgstr "باستخدام عنوان البريد الإلكتروني"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Whenever Possible"
-msgstr "كلّما كان ممكناً"
+msgstr "كلّما كان ممكنًا"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Address Book"
@@ -1237,7 +1228,7 @@ msgstr "بطاقات"
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
 #: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:401
 msgid "minutes"
 msgstr "دقائق"
 
@@ -1343,7 +1334,7 @@ msgstr "الهاتف"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "العمل"
 
@@ -1365,9 +1356,9 @@ msgid "_Birthday:"
 msgstr "عيد ال_ميلاد:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1848
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "ال_تقويم:"
 
@@ -1470,7 +1461,7 @@ msgstr "العنوان"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:521
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
 #: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
@@ -2488,6 +2479,7 @@ msgid "Service"
 msgstr "خدمة"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:693
 #: ../plugins/save-calendar/csv-format.c:375
@@ -2779,7 +2771,7 @@ msgstr "اسم ال_قائمة:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "أدخِل عنواناً بريدياً أو إسحب مراسَلاً إلى اللّائحة أدناه:"
+msgstr "أدخِل عنوانًا بريديًا أو إسحب مراسَلًا إلى اللّائحة أدناه:"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
 msgid "Contact List Members"
@@ -2795,7 +2787,7 @@ msgstr "الأ_عضاء"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
 #: ../addressbook/gui/widgets/e-addressbook-view.c:213
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:507
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "دفتر"
 
@@ -2821,7 +2813,7 @@ msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
 msgstr ""
-"الاسم أو العنوان البريدي لهذا المراسَل موجود مسبقاً\n"
+"الاسم أو العنوان البريدي لهذا المراسَل موجود مسبقًا\n"
 "في هذا المجلّد.  هل تودّ إضافته على كل حال؟"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
@@ -2837,17 +2829,18 @@ msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
-"الاسم أو العنوان البريدي لهذا المراسَل موجود مسبقاً\n"
+"الاسم أو العنوان البريدي لهذا المراسَل موجود مسبقًا\n"
 "في هذا المجلّد.  هل تودّ إضافته على كل حال؟"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:185
-msgid "Merge Contact"
-msgstr "ادمج المراسَل"
-
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
 #: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "ا_دمج"
 
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "ادمج المراسَل"
+
 #: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
@@ -2860,8 +2853,8 @@ msgstr "البريد الإلكتروني"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:162
-#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "أي حقل يحوي"
 
@@ -2871,9 +2864,9 @@ msgid "Email begins with"
 msgstr "يبدأ البريد الإلكتروني بـ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
-msgid "Name begins with"
-msgstr "يبدأ الاسم بـ"
+#, fuzzy
+msgid "Name contains"
+msgstr "يحتوي"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2892,7 +2885,7 @@ msgstr[3] "%d مراسَلين"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-addressbook-view.c:227
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:514
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "استعلم"
 
@@ -2903,7 +2896,7 @@ msgstr "خطأ أثناء الحصول على مشهد الدفتر"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-table.c:3353
 #: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
@@ -2913,6 +2906,10 @@ msgstr "النّموذج"
 msgid "Error modifying card"
 msgstr "خطأ عند تعديل البطاقة"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+msgid "Name begins with"
+msgstr "يبدأ الاسم بـ"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "المصدر"
@@ -2931,8 +2928,8 @@ msgid "Save as vCard..."
 msgstr "احفظ كـ vCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:1124
-#: ../calendar/gui/e-calendar-table.c:1365
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1574
 #: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
@@ -2983,19 +2980,18 @@ msgid "Mo_ve to Address Book..."
 msgstr "ان_قل  لدفتر عناوين..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "_قص"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:453
-#: ../calendar/gui/e-calendar-table.c:1373
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1582
 #: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2011 ../mail/em-folder-tree.c:996
-#: ../mail/em-folder-view.c:1330 ../mail/message-list.c:2045
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "ا_نسخ"
 
@@ -3047,7 +3043,7 @@ msgstr "هاتف السّيارة"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:143
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3192,11 +3188,11 @@ msgstr "موقع الويب"
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
 #: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "العرض"
@@ -3207,11 +3203,11 @@ msgstr "العرض"
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
 #: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "الإرتفاع"
@@ -3241,7 +3237,18 @@ msgstr "الطّول الأقصى لاسم الحقل"
 msgid "Column Width"
 msgstr "عرض العمود"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:173
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"ابحث عن المراسَل."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3253,9 +3260,9 @@ msgstr ""
 "\n"
 "ابحث عن المراسَل\n"
 "\n"
-"أو انقر نقراً مزدوجاً هنا لإنشاء مراسَل جديد."
+"أو انقر نقرًا مزدوجًا هنا لإنشاء مراسَل جديد."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:176
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3267,9 +3274,9 @@ msgstr ""
 "\n"
 "لا توجد أيّة عناصر لعرضها في هذا المشهد.\n"
 "\n"
-"انقر نقراً مزدوجاً هنا لإنشاء مراسَل جديد."
+"انقر نقرًا مزدوجًا هنا لإنشاء مراسَل جديد."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3279,7 +3286,7 @@ msgstr ""
 "\n"
 "ابحث عن المراسَل."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3289,7 +3296,7 @@ msgstr ""
 "\n"
 "لا توجد أيّة عناصر لعرضها في هذا المشهد."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:500
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "محوّل"
 
@@ -3319,7 +3326,7 @@ msgid "_Open Link in Browser"
 msgstr "ا_فتح الوصلة في المتصفّح"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "ا_نسخ موقع الوصلة"
 
@@ -3367,7 +3374,7 @@ msgstr "محادثة بالفيديو"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:806
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/gnome-cal.c:2376
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
@@ -3383,8 +3390,7 @@ msgstr "التقويم"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "متفرّغ/مشغول"
 
@@ -3406,12 +3412,14 @@ msgid "Web Log"
 msgstr "مدوّنة"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2355
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "عيد الميلاد"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2356
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "الذكرى السنويّة"
 
@@ -3457,7 +3465,7 @@ msgstr "لم يحدد أي مراسَل شخصي"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "رُفض التّصريح"
 
@@ -3472,7 +3480,7 @@ msgstr "لم يوجد المراسَل"
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
 #: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
-msgstr "هويّة المراسَل موجودة مسبقاً"
+msgstr "هويّة المراسَل موجودة مسبقًا"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
 #: ../addressbook/gui/widgets/eab-gui-util.c:68
@@ -3482,11 +3490,11 @@ msgstr "البروتوكول غير مدعوم"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "أُلغِيَ"
 
@@ -3551,7 +3559,7 @@ msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
-"لم نتمكّن من فتح دفتر العناوين هذا. يعني ذلك أنّك أدخلت عنواناً خطأ، أو أنّه لا "
+"لم نتمكّن من فتح دفتر العناوين هذا. يعني ذلك أنّك أدخلت عنوانًا خطأ، أو أنّه لا "
 "يمكن الوصول إلى خادوم LDAP."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:124
@@ -3568,7 +3576,7 @@ msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
-"لم نتمكّن من فتح دفتر العناوين هذا. قد يعني ذلك أنّك أدخلت عنواناً غير سليم، أو "
+"لم نتمكّن من فتح دفتر العناوين هذا. قد يعني ذلك أنّك أدخلت عنوانًا غير سليم، أو "
 "أنّه لم يمكن الوصول للخادوم."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:154
@@ -3642,17 +3650,17 @@ msgid_plural ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr[0] ""
-"فتح مراسَل واحد سيفتح أيضاً نافذ جديدة.\n"
-"هل تريد فعلاً إظهار كل هؤلاء المراسَلين؟"
+"فتح مراسَل واحد سيفتح أيضًا نافذ جديدة.\n"
+"هل تريد فعلًا إظهار كل هؤلاء المراسَلين؟"
 msgstr[1] ""
-"فتح مراسَليْن سيفتح أيضاً نافذتيْن جديدتيْن.\n"
-"هل تريد فعلاً إظهار كل هؤلاء المراسَلين؟"
+"فتح مراسَليْن سيفتح أيضًا نافذتيْن جديدتيْن.\n"
+"هل تريد فعلًا إظهار كل هؤلاء المراسَلين؟"
 msgstr[2] ""
-"فتح %d مراسَلين سيفتح أيضاً %d نوافذ جديدة.\n"
-"هل تريد فعلاً إظهار كل هؤلاء المراسَلين؟"
+"فتح %d مراسَلين سيفتح أيضًا %d نوافذ جديدة.\n"
+"هل تريد فعلًا إظهار كل هؤلاء المراسَلين؟"
 msgstr[3] ""
-"فتح %d مراسَلين سيفتح أيضاً %d نوافذ جديدة.\n"
-"هل تريد فعلاً إظهار كل هؤلاء المراسَلين؟"
+"فتح %d مراسَلين سيفتح أيضًا %d نوافذ جديدة.\n"
+"هل تريد فعلًا إظهار كل هؤلاء المراسَلين؟"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:307
 msgid "_Don't Display"
@@ -3747,7 +3755,7 @@ msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "هناك مراسَل واحد آخر."
 msgstr[1] "هناك مراسَليْن آخريْن"
-msgstr[2] "هناك %d مراسَلاً آخراً."
+msgstr[2] "هناك %d مراسَلًا آخرًا."
 msgstr[3] "هناك %d مراسَليِن آخرين."
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:228
@@ -3767,7 +3775,7 @@ msgstr "احفظ في دفتر العناوين"
 msgid "Card View"
 msgstr "مشهد البطاقة"
 
-#: ../addressbook/importers/evolution-csv-importer.c:623
+#: ../addressbook/importers/evolution-csv-importer.c:658
 #: ../addressbook/importers/evolution-ldif-importer.c:498
 #: ../addressbook/importers/evolution-vcard-importer.c:250
 #: ../calendar/importers/icalendar-importer.c:306
@@ -3775,27 +3783,27 @@ msgstr "مشهد البطاقة"
 msgid "Importing..."
 msgstr "يجري الاستيراد..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:825
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "أوتلوك  CSV أو Tab (.csv، .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "مستورد أوتلوك CSV و Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:834
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "موزيلا  CSV أو Tab (.csv، .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "مستورد موزيلا CSV و Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:843
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "إيفُليوشِن  CSV أو Tab (.csv، .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "مستورد إيفُليوشِن CSV و Tab"
 
@@ -3963,7 +3971,7 @@ msgstr "تظليل"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:985
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -4031,7 +4039,7 @@ msgstr "فشلت في فتح الدفتر"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "Specify the output file instead of standard output"
-msgstr "حدّد ملف الخرْج بدلاً من الخرْج القياسي"
+msgstr "حدّد ملف الخرْج بدلًا من الخرْج القياسي"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:50
 msgid "OUTPUTFILE"
@@ -4077,7 +4085,7 @@ msgstr "لا دعم إلا لتهيئات csv أو vcard."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "In async mode, output must be file."
-msgstr "في الوضع اللاتزامني، يجب أن يكون الخرْج ملفاً."
+msgstr "في الوضع اللاتزامني، يجب أن يكون الخرْج ملفًا."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:133
 msgid "In normal mode, there is no need for the size option."
@@ -4089,19 +4097,17 @@ msgstr "خطأ لا يمكن معالجته"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-#, fuzzy
 msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
-"'{0}' مصدر تقويم للقرائة فقط. انتقل لمشهد التقويم ثم اختر تقويما يقبل "
-"المواعيد."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
+#, fuzzy
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
 "'{0}' مصدر تقويم للقرائة فقط. انتقل لمشهد التقويم ثم اختر تقويما يقبل "
 "المواعيد."
@@ -4280,7 +4286,7 @@ msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr ""
-"إذا لم ترسل تنبيهاً بالإلغاء، قد لا يعرف المشاركون الآخرون أن الإجتماع قد "
+"إذا لم ترسل تنبيهًا بالإلغاء، قد لا يعرف المشاركون الآخرون أن الإجتماع قد "
 "أُلغِيَ."
 
 #: ../calendar/calendar.error.xml.h:43
@@ -4288,7 +4294,7 @@ msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
 msgstr ""
-"إذا لم ترسل تنبيهاً بالإلغاء، قد لا يعرف المشاركون الآخرون أن المذكرة قد حُذِفت."
+"إذا لم ترسل تنبيهًا بالإلغاء، قد لا يعرف المشاركون الآخرون أن المذكرة قد حُذِفت."
 
 #: ../calendar/calendar.error.xml.h:44
 msgid ""
@@ -4342,7 +4348,8 @@ msgid "The calendar is not marked for offline usage."
 msgstr "لم يحدد التقويم للإستخدام بدون اتصال."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
+#, fuzzy
+msgid "The memo list is not marked for offline usage."
 msgstr "لم تحدد قائمة التذكير للإستخدام بدون اتصال."
 
 #: ../calendar/calendar.error.xml.h:55
@@ -4351,15 +4358,15 @@ msgstr "لم تحدد قائمة المهام للإستخدام بدون اتص
 
 #: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
-msgstr "سيحذف التقويم نهائياً."
+msgstr "سيحذف التقويم نهائيًا."
 
 #: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
-msgstr "ستحذف قائمة التذكير نهائياً."
+msgstr "ستحذف قائمة التذكير نهائيًا."
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
-msgstr "ستحذف قائمة المهام نهائياً."
+msgstr "ستحذف قائمة المهام نهائيًا."
 
 #: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
@@ -4431,12 +4438,11 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "لو تتوفّر مهامك حتى يُعاد تشغيل إيفوليوشن."
 
 #: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "أ_همل التغييرات"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:492
-#: ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "ا_حفظ"
 
@@ -4445,7 +4451,7 @@ msgid "_Save Changes"
 msgstr "ا_حفظ التغييرات"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "أر_سل"
@@ -4501,12 +4507,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "لم يمكن كتابة قالب تطبيقات المهام للحاسوب الكفّي"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2357
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "التقويم و المهام"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:1403
 msgid "Calendars"
 msgstr "التقويمات"
 
@@ -4548,17 +4554,17 @@ msgstr "ال_تذكيرات"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
+#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
 #: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "التذكيرات"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1982
+#: ../calendar/gui/tasks-component.c:540
+#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
 #: ../calendar/gui/tasks-control.c:508
 #: ../calendar/importers/icalendar-importer.c:74
 #: ../calendar/importers/icalendar-importer.c:735
@@ -4597,7 +4603,7 @@ msgstr[3] "دقائق"
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:397
+#: ../plugins/google-account-setup/google-source.c:402
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "ساعة واحدة"
@@ -4616,10 +4622,10 @@ msgstr "مواعيد"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1595
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1600
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
 #: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1002
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "الموقع:"
 
@@ -4628,14 +4634,15 @@ msgid "Snooze _time:"
 msgstr "_وقت الغفوة:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_حرّر"
 
@@ -4647,32 +4654,32 @@ msgstr "غ_فوة"
 msgid "location of appointment"
 msgstr "موقع الموعد"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1577
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
 msgid "No summary available."
 msgstr "لا يوجود ملخّص."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No description available."
 msgstr "لا يوجد وصف."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1478
 msgid "No location information available."
 msgstr "لا تتوفّر معلومات حول الموقع."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
 #, c-format
 msgid "You have %d alarms"
 msgstr "لديك %d منبّهات"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1707
-#: ../mail/mail-component.c:1584
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1684
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1712
+#: ../mail/mail-component.c:1587
 msgid "Warning"
 msgstr "تحذير"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4684,7 +4691,7 @@ msgstr ""
 "معُدّة لإرسال بريد إلكتروني. سيعرض\n"
 "إيفُليوشِن صندوق حوار مذكّرة عادي عوضا عن ذلك."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1713
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4699,9 +4706,9 @@ msgstr ""
 "\n"
 "        %s\n"
 "\n"
-"هل تريد فعلاً تشغيل هذا البرنامج؟"
+"هل تريد فعلًا تشغيل هذا البرنامج؟"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1732
 msgid "Do not ask me about this program again."
 msgstr "لا تسألني عن هذا البرنامج ثانيةً."
 
@@ -4713,7 +4720,7 @@ msgstr "لم يمكن بدأ بونوبو"
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
-msgstr "تعذر إنشاء مصنع خدمة تبليغ التنبيهات، ربما هو يعمل الآن أصلاً..."
+msgstr "تعذر إنشاء مصنع خدمة تبليغ التنبيهات، ربما هو يعمل الآن أصلًا..."
 
 #: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
@@ -4984,12 +4991,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "اظهر حقل الحالة في محرّر الحدث/المهمّة/الإجتماع"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "اظهر لوح \"المعاينة\""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "اظهر لوح \"المعاينة\"."
 
@@ -5062,7 +5069,7 @@ msgstr "الوحدات للتذكير الافتراضي، \"دقائق\" أو \
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
-"وقت إخفاء المهام، محسوباً بـ \"الدقائق\"، أو \"الساعات\"، أو \"الأيام\"."
+"وقت إخفاء المهام، محسوبًا بـ \"الدقائق\"، أو \"الساعات\"، أو \"الأيام\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Week start"
@@ -5129,7 +5136,7 @@ msgstr "ما إذا سيظهر حقل الحالة في محرّر الحدث/ا
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
-"ما إذا سيظهر الوقت بتهيئة أربع وعشرين ساعة بدلاً من استخدام صباحاً/مساءً (ص/م)."
+"ما إذا سيظهر الوقت بتهيئة أربع وعشرين ساعة بدلًا من استخدام صباحًا/مساءً (ص/م)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to show timezone field in the event/meeting editor"
@@ -5247,7 +5254,7 @@ msgstr "نظّف الأحداث الأقدم من"
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
 #: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:403
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "الأيّام"
@@ -5256,105 +5263,105 @@ msgstr "الأيّام"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
+#: ../calendar/gui/calendar-component.c:274
+#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
 #: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
-#: ../calendar/gui/tasks-component.c:231
+#: ../calendar/gui/tasks-component.c:232
 msgid "On The Web"
 msgstr "على الويب"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "اعياد الميلاد والسنويّات"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "الطقس"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:616
 msgid "_New Calendar"
 msgstr "ت_قويم جديد"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2085
+#: ../calendar/gui/calendar-component.c:617
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "ا_نسخ..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2099
+#: ../calendar/gui/calendar-component.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "ال_خصائص"
 
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:950
 msgid "Failed upgrading calendars."
 msgstr "فشلت ترقية التقويم."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1249
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "لم يمكن فتح التقويم '%s' لإنشاء الأحداث و الإجتماعات"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1265
 msgid "There is no calendar available for creating events and meetings"
 msgstr "لا يتوفّر تقويم لإنشاء الأحداث و الإجتماعات"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1378
 msgid "Calendar Source Selector"
 msgstr "منتقي مصدر التقويم"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "موعد جديد"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
 msgid "_Appointment"
 msgstr "_موعد"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
-msgstr "أنشيء موعد جديد"
+msgstr "أنشئ موعد جديد"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "اجتماع جديد"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
 msgid "M_eeting"
 msgstr "ا_جتماع"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
-msgstr "أنشيء طلب إجتماع جديد"
+msgstr "أنشئ طلب إجتماع جديد"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
-msgstr "موعد جديد يستغرق يوماً بكامله"
+msgstr "موعد جديد يستغرق يومًا بكامله"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
 msgid "All Day A_ppointment"
-msgstr "_موعد يستغرق يوماً بكامله"
+msgstr "_موعد يستغرق يومًا بكامله"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
-msgstr "أنشيء موعد جديد يستغرق يوماً بكامله"
+msgstr "أنشئ موعد جديد يستغرق يومًا بكامله"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "تقويم جديد"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Cale_ndar"
 msgstr "الت_قويم"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
-msgstr "أنشيء تقويماً جديداً"
+msgstr "أنشئ تقويمًا جديدًا"
 
 #: ../calendar/gui/calendar-view-factory.c:109
 msgid "Day View"
@@ -5373,15 +5380,235 @@ msgid "Month View"
 msgstr "مشهد الشّهر"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#, fuzzy
+msgid "Any Field"
+msgstr "الحقل"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "المُرفقات"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "الحاضر"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+#, fuzzy
+msgid "Business"
+msgstr "فاكس العمل"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+#, fuzzy
+msgid "Category"
+msgstr "الفئة هي"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "تصنيف"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#, fuzzy
+msgid "Competition"
+msgstr "تاريخ الإنجاز"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "خصوصي"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "الوصف"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "الوصف يحتوي"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "غير موجود"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "موجود"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+#, fuzzy
+msgid "Favourites"
+msgstr "موريشيوس"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+#, fuzzy
+msgid "Holiday"
+msgstr "اليوم"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+#, fuzzy
+msgid "Hot Contacts"
+msgstr "المراسَلون"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+#, fuzzy
+msgid "Ideas"
+msgstr "الأيّام"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+#, fuzzy
+msgid "International"
+msgstr "تقليدي"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+#, fuzzy
+msgid "Key Customer"
+msgstr "خصّص"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+#, fuzzy
+msgid "Miscellaneous"
+msgstr "إعدادات متنوعة"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+#, fuzzy
+msgid "Next 7 days"
+msgstr "مهمات الأيام السبعة القادمة"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "المنظّم"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+#, fuzzy
+msgid "Phone Calls"
+msgstr "قائمة ال_هاتف"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "خاص"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "عام"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:298
+msgid "Recurrence"
+msgstr "تكرار"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "الحالة"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+#, fuzzy
+msgid "Strategies"
+msgstr "الفئات"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "الملخّص"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "الملخّص يحتوي"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+#, fuzzy
+msgid "Suppliers"
+msgstr "الردود"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+#, fuzzy
+msgid "Waiting"
+msgstr "يجري الإنتظار..."
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "يحتوي"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "لا يحتوي"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "هو"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "ليس"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "خطأ أثناء فتح التقويم"
@@ -5398,7 +5625,7 @@ msgstr "رُفض التّصريح بفتح التقويم"
 msgid "Unknown error"
 msgstr "خطأ مجهول"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:605
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "حرّر المنبّه"
 
@@ -5447,7 +5674,7 @@ msgstr "شغّل برنامج"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Select A File"
-msgstr "اختر ملفاً"
+msgstr "اختر ملفًا"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "Send To:"
@@ -5501,7 +5728,10 @@ msgstr "مرّات إضافيّة كل"
 msgid "hour(s)"
 msgstr "ساعات"
 
+#. Translators: This is the second half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:247
 msgid "minute(s)"
 msgstr "دقائق"
 
@@ -5520,12 +5750,11 @@ msgstr "أ_ضف"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "المنبّهات"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
-#: ../composer/e-composer-actions.c:63
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "ا_قترح عرض تّلقائي للمُرفق"
 
@@ -5597,7 +5826,7 @@ msgid "Display"
 msgstr "العرض"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "الجمعة"
@@ -5613,7 +5842,7 @@ msgstr ""
 "أيام"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "الإثنين"
@@ -5637,9 +5866,9 @@ msgstr ""
 "الأحد"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
-msgstr "انتقي لوناً"
+msgstr "انتقي لونًا"
 
 #. Sunday
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
@@ -5647,7 +5876,7 @@ msgid "S_un"
 msgstr "الأ_حد"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "السّبت"
@@ -5665,7 +5894,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "اظهر أر_قام الأسابيع في متصفّح التّواريخ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "الأحد"
@@ -5684,7 +5913,7 @@ msgid "Template:"
 msgstr "قالب:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "الخميس"
@@ -5699,13 +5928,13 @@ msgid "Time format:"
 msgstr "صيغة الوقت:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "الثّلاثاء"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "الأربعاء"
@@ -5721,7 +5950,7 @@ msgstr "أيّام العمل:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_12 hour (AM/PM)"
-msgstr "_12 ساعة (صباحاً/مساءً)"
+msgstr "_12 ساعة (صباحًا/مساءً)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_24 hour"
@@ -5879,40 +6108,40 @@ msgstr "%s  لقد قمت بتغييرات. أتريد تجاهل هذه الت�
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  لم تقم بأيّة تغييرات، أتريد تحديث المحرّر؟"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:516
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "خطأ في التّصديق: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:185 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " إلى "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (مُنجز "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "مُنجز "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (مُستحق "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "مُستحق "
 
-#: ../calendar/gui/dialogs/comp-editor.c:205
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "رسالة مُرفقة - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:210
-#: ../calendar/gui/dialogs/comp-editor.c:383 ../composer/e-msg-composer.c:1725
-#: ../composer/e-msg-composer.c:1944
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
+#: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -5921,29 +6150,217 @@ msgstr[1] "رسالتان مرفقتان"
 msgstr[2] "%d رسائل مرفقة"
 msgstr[3] "%d رسالة مرفقة"
 
-#: ../calendar/gui/dialogs/comp-editor.c:454 ../composer/e-msg-composer.c:2012
-#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1191 ../mail/message-list.c:2046
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "ا_نقل"
 
-#: ../calendar/gui/dialogs/comp-editor.c:456 ../composer/e-msg-composer.c:2014
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2048
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "الغي ال_سحب"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
-#: ../calendar/gui/dialogs/comp-editor.c:2854 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
 #: ../plugins/prefer-plain/prefer-plain.c:74
-#: ../widgets/misc/e-attachment-bar.c:484
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "مُرفق"
 
-#: ../calendar/gui/dialogs/comp-editor.c:821
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "لم يمكن تحديث الكائن"
 
-#: ../calendar/gui/dialogs/comp-editor.c:971
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "حرّر الموعد"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "إجتماع - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "موعد - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "مهمة مُسْندة - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "مهمّة - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "المذكرة - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+#, fuzzy
+msgid "No Summary"
+msgstr "بدون ملخّص"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "انقر هنا لغلق النافذة الحالية"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "نسخ النّص المنتقى للحافظة الوسيطة"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "قص النّص المنتقى للحافظة الوسيطة"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "انقر هنا لعرض المساعدة المتوفرة"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "لصق نص من الحافظة الوسيطة"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "انقر هنا لحفظ النافذة الحالية"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "إنتقاء كامل النّص"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "التّ_صنيف"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_ملف"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_مساعدة"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+#, fuzzy
+msgid "_Insert"
+msgstr "أ_درج"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "_خيارات"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
+msgid "_View"
+msgstr "ا_عرض"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_مُرفق..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "انقر هنا لإرفاق ملف"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "ال_فئات"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "تحديد ما إذا كنت تريد إظهار الفئات"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "المنطقة ال_زمنية"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "تحديد ما إذا كنت تريد إظهار المنطقة الزمنية"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "_عام"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "تصنيف كعام"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "_خاص"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+#, fuzzy
+msgid "Classify as private"
+msgstr "تصنيف كخاص"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "_خصوصي"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+#, fuzzy
+msgid "Classify as confidential"
+msgstr "صنف كخصوصي"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "حقل ال_دور"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "تحديد ما إذا كان حقل الدور ظاهرًا"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "_تأكيد الحضور"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "تحديد ما إذا كان حقل تأكيد الحضور ظاهرًا"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "حقل ال_حالة"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "تحديد ما إذا كان حقل الحالة ظاهرًا"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "حقل ال_نوع"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+#, fuzzy
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "تحديد ما إذا كان حقل نوع الحضور ظاهرًا"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+#, fuzzy
+msgid "Recent Docu_ments"
+msgstr "نسبة مكملة"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "إرفاق"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5952,86 +6369,46 @@ msgstr[1] "<b>مُرفقان</b>"
 msgstr[2] "<b>%d</b> مرفقات"
 msgstr[3] "<b>%d</b> مُرفقات"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1003
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "اخفي _شريط المُرفقات"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1006
-#: ../calendar/gui/dialogs/comp-editor.c:1589
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "اظهر _شريط المُرفقات"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
-#: ../calendar/gui/dialogs/event-page.c:1964
-#: ../calendar/gui/dialogs/task-page.c:1261 ../composer/e-msg-composer.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "أ_زل"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:2036
 #: ../composer/e-msg-composer.c:1049
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "أ_ضف مُرفق..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1613
+#: ../calendar/gui/dialogs/comp-editor.c:2244
 #: ../mail/em-format-html-display.c:2196
 msgid "Show Attachments"
 msgstr "اظهر المُرفقات"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1614
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "اضغط مسطرة المسافات لتبديل شريط المُرفقات"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2225
-#: ../calendar/gui/dialogs/comp-editor.c:2268
-msgid "Edit Appointment"
-msgstr "حرّر الموعد"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2231
-#: ../calendar/gui/dialogs/comp-editor.c:2274
-#, c-format
-msgid "Meeting - %s"
-msgstr "إجتماع - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Appointment - %s"
-msgstr "موعد - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2237
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "مهمة مُسْندة - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Task - %s"
-msgstr "مهمّة - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2242
-#: ../calendar/gui/dialogs/comp-editor.c:2285
-#, c-format
-msgid "Memo - %s"
-msgstr "المذكرة - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2253
-#: ../calendar/gui/dialogs/comp-editor.c:2295
-msgid "No summary"
-msgstr "بدون ملخّص"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2943
-#: ../calendar/gui/dialogs/comp-editor.c:2997
-#: ../calendar/gui/dialogs/comp-editor.c:3021
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "قد تهمل التّغييرات التي أُجريت لهذا العنصر في حال وصول تحديث"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "لم يمكن استخدام الإصدارة الحاليّة!"
 
@@ -6112,105 +6489,152 @@ msgstr "مُفًّوَض إلى:"
 msgid "Enter Delegate"
 msgstr "أدخل المُفَوَّضْ"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "ال_منبّهات"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr "انقر هنا لتعيين أو إزالة المنبهات لهذا الحدث"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "ت_كرار"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "إجعل هذا حدثًا متكررًا"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "خيارات الإرسال"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "أدرج خيارات إرسال متقدمة"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "حدث يستغرق _يومًا بأكمله"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "تغيير ما إذا كان الحدث يستغرق يومًا بأكمله"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+#, fuzzy
+msgid "Show Time as _Busy"
+msgstr "اعرض حالتي كمش_غول في هذا الوقت"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "تحديد ما إذا كنت تريد تغيير حالتك إلى مشغول في هذا الوقت"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "_متفرّغ/مشغول"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "الاستعلام عن معلومات متوفر/مشغول للحضور"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "مو_عد"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "تكرار"
-
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.c:2832
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "لهذا الحدث منبّهات"
 
-#: ../calendar/gui/dialogs/event-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "ال_منظّم:"
 
-#: ../calendar/gui/dialogs/event-page.c:941
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "_مفوِّضون"
 
-#: ../calendar/gui/dialogs/event-page.c:943
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "ال_حضور"
 
-#: ../calendar/gui/dialogs/event-page.c:1125
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "حدث بدون يوم بدأ"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "حدث بدون يوم انتهاء"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
-#: ../calendar/gui/dialogs/memo-page.c:729
-#: ../calendar/gui/dialogs/task-page.c:888
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "تاريخ البدء خاطئ"
 
-#: ../calendar/gui/dialogs/event-page.c:1310
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "تاريخ الإنتهاء خاطئ"
 
-#: ../calendar/gui/dialogs/event-page.c:1333
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "زمن البدء خاطئ"
 
-#: ../calendar/gui/dialogs/event-page.c:1340
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "زمن الإنتهاء خاطئ"
 
-#: ../calendar/gui/dialogs/event-page.c:1502
-#: ../calendar/gui/dialogs/memo-page.c:769
-#: ../calendar/gui/dialogs/task-page.c:947
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
-msgstr "المنظّم المنتقى لم يعد يمتلك حساباً."
+msgstr "المنظّم المنتقى لم يعد يمتلك حسابًا."
 
-#: ../calendar/gui/dialogs/event-page.c:1508
-#: ../calendar/gui/dialogs/memo-page.c:775
-#: ../calendar/gui/dialogs/task-page.c:953
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "مطلوب منظّم."
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/task-page.c:977
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "تحتاج إلى حاضرٍ واحد على الأقل."
 
-#: ../calendar/gui/dialogs/event-page.c:1965
-#: ../calendar/gui/dialogs/task-page.c:1262
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "أ_ضف"
 
-#: ../calendar/gui/dialogs/event-page.c:2708
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "تعذر فتح التقويم '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2752
-#: ../calendar/gui/dialogs/memo-page.c:985
-#: ../calendar/gui/dialogs/task-page.c:1923
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "أنت تتصرف بالنيابة عن %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3050
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "يوم واحد قبل الموعد"
 msgstr[1] "يومان قبل الموعد"
 msgstr[2] "%d أيام قبل الموعد"
-msgstr[3] "%d يوماً قبل الموعد"
+msgstr[3] "%d يومًا قبل الموعد"
 
-#: ../calendar/gui/dialogs/event-page.c:3056
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6219,7 +6643,7 @@ msgstr[1] "ساعتان قبل الموعد"
 msgstr[2] "%d ساعات قبل الموعد"
 msgstr[3] "%d ساعة قبل الموعد"
 
-#: ../calendar/gui/dialogs/event-page.c:3062
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6228,22 +6652,22 @@ msgstr[1] "دقيقتين قبل الموعد"
 msgstr[2] "%d دقائق قبل الموعد"
 msgstr[3] "%d دقيقة قبل الموعد"
 
-#: ../calendar/gui/dialogs/event-page.c:3075
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "خصّص"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3080
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:907
-#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1408
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
 #: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2020
+#: ../plugins/itip-formatter/itip-formatter.c:2022
 #: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
 #: ../widgets/misc/e-dateedit.c:1731
 #: ../widgets/misc/e-signature-combo-box.c:69
@@ -6318,26 +6742,22 @@ msgstr "غيّ_ر المنظّم"
 msgid "Co_ntacts..."
 msgstr "المُ_راسَلين..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "المنظّم"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "المنظّم:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "تذكير"
 
-#: ../calendar/gui/dialogs/memo-page.c:947
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "لا يمكن فتح التذكير في '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1131 ../mail/em-format-html.c:1559
-#: ../mail/em-format-html.c:1617 ../mail/em-format-html.c:1643
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
@@ -6357,7 +6777,7 @@ msgid "_Description:"
 msgstr "ال_وصف:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "م_جموعة:"
@@ -6398,17 +6818,17 @@ msgstr "هذه الحالة و الحالات القادمة"
 msgid "All Instances"
 msgstr "كل الحالات"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:495
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "يحتوي هذا الموعد متكرّرات لا يستطيع إيفُليوشِن أن يعدّلها."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:816
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "تاريخ التّكرار غير صحيح"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "يعمل"
 
@@ -6416,7 +6836,7 @@ msgstr "يعمل"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "الأوّل"
 
@@ -6425,7 +6845,7 @@ msgstr "الأوّل"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:999
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "الثّاني"
 
@@ -6433,7 +6853,7 @@ msgstr "الثّاني"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1004
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "الثّالث"
 
@@ -6441,7 +6861,7 @@ msgstr "الثّالث"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "الرّابع"
 
@@ -6449,13 +6869,13 @@ msgstr "الرّابع"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "الأخير"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "تاريخ آخر"
 
@@ -6463,7 +6883,7 @@ msgstr "تاريخ آخر"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "الأول للعاشر"
 
@@ -6471,7 +6891,7 @@ msgstr "الأول للعاشر"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1054
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "الحادي عشر للعشرين"
 
@@ -6479,45 +6899,45 @@ msgstr "الحادي عشر للعشرين"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "الواحد والعشرين للواحد والثلاثين"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "اليوم"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "عند"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "حدوثات"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "أضِف إستثناء"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "لم أجد منتقى لتعديله."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "عدّل الإستثناء"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "لم أجد منتقى لحذفِه."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "التّاريخ/الوقت"
 
@@ -6568,12 +6988,12 @@ msgstr "أسابيع"
 msgid "year(s)"
 msgstr "سنين"
 
-#: ../calendar/gui/dialogs/task-details-page.c:409
-#: ../calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "تاريخ الإنجاز خاطئ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:514
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "صفحة الويب"
 
@@ -6588,51 +7008,55 @@ msgstr "<span weight=\"bold\">الحالة</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
 #: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "مُنجز"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:271
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "مرتفع"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "في تقدّم"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:275
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1061
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "منخفض"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:273
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1062
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "عادي"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "لم يبدأ"
 
@@ -6645,7 +7069,7 @@ msgid "Stat_us:"
 msgstr "الحا_لة:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "غير معرّف"
 
@@ -6662,25 +7086,38 @@ msgstr "الأ_ولويّة:"
 msgid "_Web Page:"
 msgstr "_صفحة الويب:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "تفاصيل ال_حالة"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+#, fuzzy
+msgid "Click to change or view the status details of the task"
+msgstr "انقر غيِّر / اعرض تفاصيل حالة المهمة"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "خيارات الإر_سال"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_مهمّة"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "تفاصيل المهمّة"
 
-#: ../calendar/gui/dialogs/task-page.c:454
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "المن_ظّم:"
 
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "تاريخ الإستحقاق خاطئ"
 
-#: ../calendar/gui/dialogs/task-page.c:1880
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "لا يمكن فتح المهمّة في '%s'."
@@ -6713,7 +7150,7 @@ msgid_plural "%d days"
 msgstr[0] "يوم واحد"
 msgstr[1] "يومين"
 msgstr[2] "%d أيام"
-msgstr[3] "%d يوماً"
+msgstr[3] "%d يومًا"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:398
@@ -6723,7 +7160,7 @@ msgid_plural "%d weeks"
 msgstr[0] "أسبوع واحد"
 msgstr[1] "أسبوعين"
 msgstr[2] "%d أسابيع"
-msgstr[3] "%d أسبوعاً"
+msgstr[3] "%d أسبوعًا"
 
 #: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
@@ -6785,75 +7222,59 @@ msgstr "%s عند الساعة %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s لنوعيّة محفّز مجهولة"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "انقر لفتح %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:134
-#: ../calendar/gui/e-cal-component-preview.c:176 ../filter/filter-rule.c:820
-#: ../shell/e-shell-folder-title-bar.c:586
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
 msgid "Untitled"
 msgstr "بدون عنوان"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:186
-#: ../calendar/gui/e-cal-component-preview.c:216
-#: ../calendar/gui/e-cal-component-preview.c:227
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
 msgstr "تاريخ البدء:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
 #: ../calendar/gui/e-itip-control.c:1218
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "الوصف:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:235
-#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "صفحة الويب:"
 
-#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:210
 #: ../calendar/gui/e-itip-control.c:1162
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "ملخّص:"
 
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "تاريخ الإستحقاق:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:246
 #: ../calendar/gui/e-itip-control.c:1186
 #: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:1027
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "الحالة:"
 
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "الأولويّة:"
 
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "عام"
-
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "خاص"
-
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "خصوصي"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "تاريخ الإنتهاء"
@@ -6863,20 +7284,13 @@ msgstr "تاريخ الإنتهاء"
 msgid "Start Date"
 msgstr "تاريخ البدء"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:361
-msgid "Summary"
-msgstr "الملخّص"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "متفرّغ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:620
 #: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "مشغول"
@@ -6913,12 +7327,12 @@ msgstr "لا"
 #: ../calendar/gui/e-meeting-list-view.c:167
 #: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2045
-#: ../plugins/plugin-manager/plugin-manager.c:69
-#: ../widgets/misc/e-attachment-bar.c:852
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "مجهول"
@@ -6944,9 +7358,9 @@ msgstr "اختر مجلّد لحِفظ المُرفق المحدّد..."
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1367
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
 #: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1341 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "ا_حفظ كـ..."
 
@@ -6964,126 +7378,155 @@ msgstr "ا_حفِظ المنتقى"
 msgid "Open in %s..."
 msgstr "افتح في %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+#, fuzzy
+msgid "* No Summary *"
+msgstr "بدون ملخّص"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "المنظّم: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:377
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "المنظّم: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+#, fuzzy
+msgid "Start: "
+msgstr "إبدأ"
+
+#: ../calendar/gui/e-calendar-table.c:420
+#, fuzzy
+msgid "Due: "
+msgstr "مُستحق "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
+#: ../calendar/gui/e-calendar-table.c:879
 #: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "يجري حذف الكائنات المنتقاة"
 
-#: ../calendar/gui/e-calendar-table.c:954
+#: ../calendar/gui/e-calendar-table.c:1163
 #: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "يجري تحديث الكائِنات"
 
-#: ../calendar/gui/e-calendar-table.c:1139
+#: ../calendar/gui/e-calendar-table.c:1348
 #: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "احفظ كـ..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
+#: ../calendar/gui/e-calendar-table.c:1571
 #: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "_مهمّة جديدة"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "افتح _صفحة الويب"
 
-#: ../calendar/gui/e-calendar-table.c:1368
+#: ../calendar/gui/e-calendar-table.c:1577
 #: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "ا_طبع..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
+#: ../calendar/gui/e-calendar-table.c:1581
 #: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_قص"
 
-#: ../calendar/gui/e-calendar-table.c:1374
+#: ../calendar/gui/e-calendar-table.c:1583
 #: ../calendar/gui/e-calendar-view.c:1669
 #: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "ا_لصق"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_كلّف بالمهمّة"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_مرّر كـ iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "_علّم كمكتمل"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_علّم المهام المنتقاة كمكتملة"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "_علّم كغير مكتمل"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_علّم المهام المنتقاة كغير مكتملة"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "ا_حذف المهام المنتقاة"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "انقر لإضافة مهمّة"
@@ -7106,6 +7549,7 @@ msgid "Due date"
 msgstr "تاريخ الإستحقاق"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/tasktypes.xml.h:37
 #: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "الأولويّة"
@@ -7114,13 +7558,6 @@ msgstr "الأولويّة"
 msgid "Start date"
 msgstr "تاريخ البدء"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:545
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "الحالة"
-
 #: ../calendar/gui/e-calendar-view.c:1349
 msgid "Moving items"
 msgstr "نقل العناصر"
@@ -7135,7 +7572,7 @@ msgstr "_موعد جديد..."
 
 #: ../calendar/gui/e-calendar-view.c:1661
 msgid "New All Day _Event"
-msgstr "_حدث جديد يستغرق يوماً بأكمله"
+msgstr "_حدث جديد يستغرق يومًا بأكمله"
 
 #: ../calendar/gui/e-calendar-view.c:1662
 msgid "New _Meeting"
@@ -7152,7 +7589,7 @@ msgstr "انتقِ اليوم ال_حالي"
 
 #: ../calendar/gui/e-calendar-view.c:1676
 msgid "_Select Date..."
-msgstr "ا_نتقِ تاريخاً..."
+msgstr "ا_نتقِ تاريخًا..."
 
 #: ../calendar/gui/e-calendar-view.c:1682
 msgid "Pri_nt..."
@@ -7182,7 +7619,7 @@ msgstr "_مرّر كـiCalendar..."
 msgid "_Reply"
 msgstr "_رد"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1335
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
 #: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
@@ -7200,26 +7637,14 @@ msgstr "احذف هذا ال_حدوث"
 msgid "Delete _All Occurrences"
 msgstr "احذف _كل الحدوثات"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2227
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "المنظّم: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2231
-#, c-format
-msgid "Organizer: %s"
-msgstr "المنظّم: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2247 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "الموقع: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2281
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "الوقت: %s %s"
@@ -7259,19 +7684,19 @@ msgstr "أقسام بـ %02i دقيقة"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1672
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "ص"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "م"
 
@@ -7286,7 +7711,7 @@ msgid_plural "Every %d days"
 msgstr[0] "كل يوم"
 msgstr[1] "كل يومين"
 msgstr[2] "كل %d أيام"
-msgstr[3] "كل %d يوماً"
+msgstr[3] "كل %d يومًا"
 
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
@@ -7304,7 +7729,7 @@ msgid_plural "Every %d weeks on "
 msgstr[0] "كل أسبوع في"
 msgstr[1] "كل أسبوعين في"
 msgstr[2] "كل %d أسابيع في"
-msgstr[3] "كل %d أسبوعاً في"
+msgstr[3] "كل %d أسبوعًا في"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
 #: ../calendar/gui/e-itip-control.c:813
@@ -7328,7 +7753,7 @@ msgid_plural "every %d months"
 msgstr[0] "كل شهر"
 msgstr[1] "كل شهرين"
 msgstr[2] "كل %d أشهر"
-msgstr[3] "كل %d شهراً"
+msgstr[3] "كل %d شهرًا"
 
 #: ../calendar/gui/e-itip-control.c:861
 #, c-format
@@ -7399,20 +7824,20 @@ msgstr "<br> رجاء راجِع المعلومات التّالية ثم اخت
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2033
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "مقبول"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2036
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
-msgstr "مقبول مبدئيّاً"
+msgstr "مقبول مبدئيًّا"
 
 #: ../calendar/gui/e-itip-control.c:1199
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
 #: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2039
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "مرفوض"
 
@@ -7631,7 +8056,7 @@ msgstr "تم تحديث حالة الحاضر\n"
 #: ../calendar/gui/e-itip-control.c:2080
 #: ../plugins/itip-formatter/itip-formatter.c:1254
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "لا يمكن تحديث حالة الحاضر لأنّ العنصر لم يعد موجوداً"
+msgstr "لا يمكن تحديث حالة الحاضر لأنّ العنصر لم يعد موجودًا"
 
 #: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
@@ -7656,7 +8081,7 @@ msgstr "تقبّل"
 
 #: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
-msgstr "تقبّل مبدئيّاً"
+msgstr "تقبّل مبدئيًّا"
 
 #: ../calendar/gui/e-itip-control.c:2357
 #: ../plugins/groupwise-features/process-meeting.c:50
@@ -7726,49 +8151,49 @@ msgstr "الحضور"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
 msgid "Individual"
 msgstr "فرد"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
 #: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "مجموعة"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:967
+#: ../calendar/gui/print.c:983
 msgid "Resource"
 msgstr "المورد"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:968
+#: ../calendar/gui/print.c:984
 msgid "Room"
 msgstr "الغرفة"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/print.c:998
 msgid "Chair"
 msgstr "الكرسي"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
 #: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
 msgid "Required Participant"
 msgstr "مشارك ضروري"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/print.c:1000
 msgid "Optional Participant"
 msgstr "مشارك إختياري"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "غير مشارك"
 
@@ -7787,7 +8212,7 @@ msgstr "مبدئي"
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
 #: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2042
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "مفوّض"
 
@@ -7850,7 +8275,7 @@ msgstr "اظهر ساعات العمل _فقط"
 
 #: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
-msgstr "أظهر م_صغراً"
+msgstr "أظهر م_صغرًا"
 
 #: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
@@ -7862,7 +8287,7 @@ msgstr "_<<"
 
 #: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
-msgstr "ا_ختر تلقائياً"
+msgstr "ا_ختر تلقائيًا"
 
 #: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
@@ -7892,10 +8317,6 @@ msgstr "زمن ال_بدء:"
 msgid "_End time:"
 msgstr "زمن الإ_نتهاء:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "الحاضر"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "أُنقر هنا لإضافة حاضر"
@@ -7975,7 +8396,7 @@ msgstr "انتقِ منطقة زمنيّة"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -8065,7 +8486,7 @@ msgstr "أكتوبر"
 
 #: ../calendar/gui/goto-dialog.glade.h:12
 msgid "Select Date"
-msgstr "انتقِ تاريخاً"
+msgstr "انتقِ تاريخًا"
 
 #: ../calendar/gui/goto-dialog.glade.h:13
 msgid "September"
@@ -8127,13 +8548,13 @@ msgstr "معلومات iCalendar"
 
 #: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
-msgstr "يجب أن تكون حاضراً للحدث."
+msgstr "يجب أن تكون حاضرًا للحدث."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:465
 msgid "_New Memo List"
 msgstr "قائمة تذكيرات _جديدة"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:545
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8142,7 +8563,7 @@ msgstr[1] "تذكيرتين"
 msgstr[2] "%d تذكيرات"
 msgstr[3] "%d تذكيرة"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8151,63 +8572,56 @@ msgstr[1] "، اثنان مُنتقيان"
 msgstr[2] "، %d منتقاة"
 msgstr[3] "، %d منتقَى"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:594
 msgid "Failed upgrading memos."
 msgstr "فشل ترقية التذكيرات."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:954
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "لم يمكن فتح قائمة التذكيرات '%s' لإنشاء الأحداث و الإجتماعات"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:967
 msgid "There is no calendar available for creating memos"
 msgstr "لا يتوفّر تقويم لإنشاء التذكيرات"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1077
 msgid "Memo Source Selector"
 msgstr "منتقي مصدر التذكيرات"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "تذكير جديد"
 
-#: ../calendar/gui/memos-component.c:1260
-msgid "Mem_o"
-msgstr "ت_ذكير"
-
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
-msgstr "انشيء تذكير جديد"
+msgstr "أنشئ تذكير جديد"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "تذكير جديد مُشارَك"
 
-#: ../calendar/gui/memos-component.c:1268
-msgid "_Shared memo"
-msgstr "تذكيرات _مشاركة"
-
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
-msgstr "انشيء تذكير مُشارَك جديد"
+msgstr "أنشئ تذكير مُشارَك جديد"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "قائمة تذكيرات جديدة"
 
-#: ../calendar/gui/memos-component.c:1276
-msgid "Memo li_st"
-msgstr "قائ_مة التذكيرات"
-
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
-msgstr "انشيء قائمة تذكيرات جديدة"
+msgstr "أنشئ قائمة تذكيرات جديدة"
 
 #: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
 msgstr "اطبع التذكيرات"
 
+#: ../calendar/gui/memotypes.xml.h:25
+#, fuzzy
+msgid "Next 7 Days"
+msgstr "مهمات الأيام السبعة القادمة"
+
 #: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8408,62 +8822,62 @@ msgstr "جمعة"
 msgid "Sa"
 msgstr "سّبت"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "موعد"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "مهمَّة"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "الملخّص: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "الحضور:"
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "الحالة: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "الأولوية: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "النّسبة المُنجزة: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "العنوان: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "الفئات: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "المراسَلون: "
 
 #. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:2762
 msgid "Upcoming Appointments"
 msgstr "المواعيد القادمة"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:456
 msgid "_New Task List"
 msgstr "قائمة مهام _جديدة"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:536
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8472,54 +8886,46 @@ msgstr[1] "مهمّتين"
 msgstr[2] "%d مهمّات"
 msgstr[3] "%d مهمّة"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:585
 msgid "Failed upgrading tasks."
 msgstr "فشلت في ترقية المهام."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:942
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "لم يمكن فتح قائمة المهام '%s' لإنشاء الأحداث و الإجتماعات"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:955
 msgid "There is no calendar available for creating tasks"
 msgstr "لا يتوفّر تقويم لإنشاء المهام"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1066
 msgid "Task Source Selector"
 msgstr "منتقي مصدر المهام"
 
-#: ../calendar/gui/tasks-component.c:1324
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "مهمّة جديدة"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
-msgstr "أنشيء مهمّةً جديدة"
+msgstr "أنشئ مهمّةً جديدة"
 
-#: ../calendar/gui/tasks-component.c:1332
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "مهمّة مُسندة جديدة"
 
-#: ../calendar/gui/tasks-component.c:1333
-msgid "Assigne_d Task"
-msgstr "مهمّة _مسندة"
-
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
-msgstr "أنشيء مهمّة مُسندة جديدة"
+msgstr "أنشئ مهمّة مُسندة جديدة"
 
-#: ../calendar/gui/tasks-component.c:1340
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "قائمة مهام جديدة"
 
-#: ../calendar/gui/tasks-component.c:1341
-msgid "Tas_k list"
-msgstr "قائمة م_هام"
-
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
-msgstr "انشيء قائمة مهام جديدة"
+msgstr "أنشئ قائمة مهام جديدة"
 
 #: ../calendar/gui/tasks-control.c:452
 msgid ""
@@ -8531,9 +8937,9 @@ msgstr ""
 "هذه العمليّة ستمحو بشكل دائم كل المهام المعلّمة على أنّها منجزة. إذا تابعت، لن "
 "تتمكّن من إستعادة هذه المهام.\n"
 "\n"
-"أترغب فعلاً في حذف هذه المهام؟"
+"أترغب فعلًا في حذف هذه المهام؟"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1131
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "لا تسألني ثانيةً."
 
@@ -8541,6 +8947,29 @@ msgstr "لا تسألني ثانيةً."
 msgid "Print Tasks"
 msgstr "اطبع المهام"
 
+#: ../calendar/gui/tasktypes.xml.h:2
+#, fuzzy, no-c-format
+msgid "% Completed"
+msgstr "% منجز"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+#, fuzzy
+msgid "Cancelled"
+msgstr "أُلغِيَ"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+#, fuzzy
+msgid "In progress"
+msgstr "في تقدّم"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "أكبر من"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "أصغر من"
+
 #: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "المواعيد والإجتماعات"
@@ -10118,203 +10547,201 @@ msgstr "لم يمكن فتح ملف"
 msgid "Unable to retrieve message from editor"
 msgstr "لا يمكن جلب الرّسالة من المحرّر"
 
-#: ../composer/e-composer-actions.c:46
+#: ../composer/e-composer-actions.c:47
 msgid "Insert Attachment"
-msgstr "أدرج مُرفقاً"
+msgstr "أدرج مُرفقًا"
 
-#: ../composer/e-composer-actions.c:50
+#: ../composer/e-composer-actions.c:51
 msgid "A_ttach"
 msgstr "أ_رفِق"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:143
 msgid "Untitled Message"
 msgstr "رسالة بدون عنوان"
 
-#: ../composer/e-composer-actions.c:464 ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "_مُرفق..."
-
-#: ../composer/e-composer-actions.c:466
+#: ../composer/e-composer-actions.c:474
 msgid "Attach a file"
 msgstr "إرفاق ملف"
 
-#: ../composer/e-composer-actions.c:471 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_غلق"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:481
 msgid "Close the current file"
 msgstr "غلق الملف الحالي"
 
-#: ../composer/e-composer-actions.c:478 ../mail/em-folder-view.c:1342
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "ا_طبع..."
 
-#: ../composer/e-composer-actions.c:485 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
 #: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_معاينة قبل الطّباعة"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:502
 msgid "Save the current file"
 msgstr "احفظ الملف الحالي"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:507
 msgid "Save _As..."
 msgstr "احفظ _كـ..."
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:509
 msgid "Save the current file with a different name"
 msgstr "احفظ الملف الحالي باسم مغاير"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:514
 msgid "Save _Draft"
 msgstr "احفظ _مسودّة"
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:516
 msgid "Save as draft"
 msgstr "احفظ _كمسودة"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:521
 msgid "S_end"
 msgstr "أر_سِل"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:523
 msgid "Send this message"
 msgstr "أرسِل هذه الرسالة"
 
-#: ../composer/e-composer-actions.c:520 ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "خيارات الإر_سال"
-
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:530
 msgid "Insert Send options"
 msgstr "أدرج خيارات الإرسال"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:535
+#, fuzzy
+msgid "New _Message"
+msgstr "_رسالة"
+
+#: ../composer/e-composer-actions.c:537
+#, fuzzy
+msgid "Open New Message window"
+msgstr "ار_سل رسالة جديدة إلى..."
+
+#: ../composer/e-composer-actions.c:544
 #, fuzzy
 msgid "Character _Encoding"
 msgstr "ترميز المحارف"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:551
 msgid "_Security"
 msgstr "أ_من"
 
-#: ../composer/e-composer-actions.c:546
+#: ../composer/e-composer-actions.c:561
 msgid "PGP _Encrypt"
 msgstr "_شفّر باستعمال PGP"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:563
 msgid "Encrypt this message with PGP"
 msgstr "تشفير هذه الرسالة باستخدام PGP"
 
-#: ../composer/e-composer-actions.c:554
+#: ../composer/e-composer-actions.c:569
 msgid "PGP _Sign"
 msgstr "و_قّع باستعمال PGP"
 
-#: ../composer/e-composer-actions.c:556
+#: ../composer/e-composer-actions.c:571
 msgid "Sign this message with your PGP key"
 msgstr "توقيع الرسالة بمفتاح PGP الخاص بك"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:577
 msgid "_Prioritize Message"
 msgstr "إعطاء أول_وية للرسالة"
 
-#: ../composer/e-composer-actions.c:564
+#: ../composer/e-composer-actions.c:579
 msgid "Set the message priority to high"
 msgstr "عين أهمية الرسالة إلى عالي"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:585
 #, fuzzy
 msgid "Re_quest Read Receipt"
-msgstr "اطلب إخ_طاراً بالوصول"
+msgstr "اطلب إخ_طارًا بالوصول"
 
-#: ../composer/e-composer-actions.c:572
+#: ../composer/e-composer-actions.c:587
 msgid "Get delivery notification when your message is read"
-msgstr "استقبل إخطاراً بالوصول عندما تتم قراءة رسالتك"
+msgstr "استقبل إخطارًا بالوصول عندما تتم قراءة رسالتك"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:593
 msgid "S/MIME En_crypt"
 msgstr "_شفّر باستعمال S/MIME"
 
-#: ../composer/e-composer-actions.c:580
+#: ../composer/e-composer-actions.c:595
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "تشفير هذه الرسالة بشهادة تشفير S/MIME الخاصة بك"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:601
 msgid "S/MIME Sig_n"
 msgstr "و_قّع باستعمال S/MIME"
 
-#: ../composer/e-composer-actions.c:588
+#: ../composer/e-composer-actions.c:603
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "توقيع الرسالة بتوقيع شهادة S/MIME خاصة بك"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:609
 msgid "_Bcc Field"
 msgstr "حقل النّسخة الكربونيّة ال_مخفيّة"
 
-#: ../composer/e-composer-actions.c:596
+#: ../composer/e-composer-actions.c:611
 msgid "Toggles whether the BCC field is displayed"
-msgstr "تحديد ما إذا كان حقل \"ن.ك.م\" ظاهراً"
+msgstr "تحديد ما إذا كان حقل \"ن.ك.م\" ظاهرًا"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:617
 msgid "_Cc Field"
 msgstr "حقل ال_نسخة الكربونية"
 
-#: ../composer/e-composer-actions.c:604
+#: ../composer/e-composer-actions.c:619
 msgid "Toggles whether the CC field is displayed"
-msgstr "تحديد ما إذا كان حقل \"ن.ك\" ظاهراً"
+msgstr "تحديد ما إذا كان حقل \"ن.ك\" ظاهرًا"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:625
 msgid "_From Field"
 msgstr "حقل _مِن"
 
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:627
 msgid "Toggles whether the From chooser is displayed"
-msgstr "تحديد ما إذا كان مختار حقل \"مِن\" ظاهراً"
+msgstr "تحديد ما إذا كان مختار حقل \"مِن\" ظاهرًا"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:633
 msgid "_Post-To Field"
 msgstr "حقل ا_نشر إلى"
 
-#: ../composer/e-composer-actions.c:620
+#: ../composer/e-composer-actions.c:635
 msgid "Toggles whether the Post-To field is displayed"
-msgstr "تحديد ما إذا كان حقل \"نشر إلى\" ظاهراً"
+msgstr "تحديد ما إذا كان حقل \"نشر إلى\" ظاهرًا"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:641
 msgid "_Reply-To Field"
 msgstr "حقل ال_رّد إلى"
 
-#: ../composer/e-composer-actions.c:628
+#: ../composer/e-composer-actions.c:643
 msgid "Toggles whether the Reply-To field is displayed"
-msgstr "تحديد ما إذا كان حقل \"رد إلى\" ظاهراً"
+msgstr "تحديد ما إذا كان حقل \"رد إلى\" ظاهرًا"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:649
 #, fuzzy
 msgid "_Subject Field"
 msgstr "حقل ال_نسخة الكربونية"
 
-#: ../composer/e-composer-actions.c:636
+#: ../composer/e-composer-actions.c:651
 #, fuzzy
 msgid "Toggles whether the Subject field is displayed"
-msgstr "تحديد ما إذا كان حقل الحالة ظاهراً"
+msgstr "تحديد ما إذا كان حقل الحالة ظاهرًا"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:657
 msgid "_To Field"
 msgstr "حقل إ_لى"
 
-#: ../composer/e-composer-actions.c:644
+#: ../composer/e-composer-actions.c:659
 msgid "Toggles whether the To field is displayed"
-msgstr "تحديد ما إذا كان حقل \"إلى\" ظاهراً"
-
-#: ../composer/e-composer-actions.c:685 ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "إرفاق"
+msgstr "تحديد ما إذا كان حقل \"إلى\" ظاهرًا"
 
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
@@ -10415,11 +10842,11 @@ msgstr[3] "مُرفق"
 msgid "Hide _Attachment Bar"
 msgstr "اخفي شريط ال_مرفقات"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2734
+#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
 msgid "Compose Message"
 msgstr "اكتب رسالة"
 
-#: ../composer/e-msg-composer.c:4009
+#: ../composer/e-msg-composer.c:4056
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10523,7 +10950,7 @@ msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
-"لإرفاق محتويات هذا الدليل، إما أرفقهم ملفا ملفاً أو انشيئ محفوظة من الديل "
+"لإرفاق محتويات هذا الدليل، إما أرفقهم ملفا ملفًا أو انشيئ محفوظة من الديل "
 "وأرفقها."
 
 #: ../composer/mail-composer.error.xml.h:21
@@ -10555,25 +10982,30 @@ msgstr "لا يمكنك إرفاق الملف `{0}' بهِذه الرسالة."
 
 #: ../composer/mail-composer.error.xml.h:28
 msgid "You need to configure an account before you can compose mail."
-msgstr "يجب أن تُعدّ حساباً قبل أن تتمكّن من كتابة بريد."
+msgstr "يجب أن تُعدّ حسابًا قبل أن تتمكّن من كتابة بريد."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "تابع الت_حرير"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_لا تستعِد"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
 msgid "_Recover"
 msgstr "ا_ستعِد"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "احف_ظ الرّسالة"
+#: ../composer/mail-composer.error.xml.h:33
+#, fuzzy
+msgid "_Save Draft"
+msgstr "احفظ _مسودّة"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "بريد و تقويم إيفُليوشِن"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "حِزمة Groupware"
 
@@ -10622,7 +11054,7 @@ msgstr ""
 
 #: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
 #: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
-#: ../plugins/plugin-manager/plugin-manager.c:316
+#: ../plugins/plugin-manager/plugin-manager.c:339
 #: ../plugins/publish-calendar/publish-calendar.c:689
 msgid "Enabled"
 msgstr "مفعّل"
@@ -10630,17 +11062,17 @@ msgstr "مفعّل"
 #: ../e-util/e-plugin.c:309
 #, fuzzy
 msgid "Whether the plugin is enabled"
-msgstr "ما إن كان الموسع موسعاً أم لا"
+msgstr "ما إن كان الموسع موسعًا أم لا"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "حدث خطأ أثناء الطباعة"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "أبلغ نظام الطباعة عن تفاصيل الخطأ الآتية:"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:171
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "لم يبلغ نظام الطباعة عن أي تفاصيل إضافية عن الخطأ."
@@ -10699,7 +11131,7 @@ msgstr "للق_يام به"
 #. blue
 #: ../e-util/e-util-labels.c:41
 msgid "_Later"
-msgstr "لا_حقاً"
+msgstr "لا_حقًا"
 
 #: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
@@ -10803,7 +11235,7 @@ msgid_plural "%d days in the future"
 msgstr[0] "بعد يوم واحد"
 msgstr[1] "بعد يومين"
 msgstr[2] "بعد %d أيام"
-msgstr[3] "بعد %d يوماً"
+msgstr[3] "بعد %d يومًا"
 
 #: ../filter/filter-datespec.c:84
 #, c-format
@@ -10821,7 +11253,7 @@ msgid_plural "%d weeks in the future"
 msgstr[0] "بعد أسبوع واحد"
 msgstr[1] "بعد أسبوعين"
 msgstr[2] "بعد %d أسابيع"
-msgstr[3] "بعد %d أسبوعاً"
+msgstr[3] "بعد %d أسبوعًا"
 
 #: ../filter/filter-datespec.c:85
 #, c-format
@@ -10830,7 +11262,7 @@ msgid_plural "%d months ago"
 msgstr[0] "منذ شهر واحد"
 msgstr[1] "منذ شهرين"
 msgstr[2] "منذ %d أشهر"
-msgstr[3] "منذ %d شهراً"
+msgstr[3] "منذ %d شهرًا"
 
 #: ../filter/filter-datespec.c:85
 #, c-format
@@ -10839,7 +11271,7 @@ msgid_plural "%d months in the future"
 msgstr[0] "بعد شهر واحد"
 msgstr[1] "بعد شهرين"
 msgstr[2] "بعد %d شهور"
-msgstr[3] "بعد %d شهراً"
+msgstr[3] "بعد %d شهرًا"
 
 #: ../filter/filter-datespec.c:86
 #, c-format
@@ -10857,7 +11289,7 @@ msgid_plural "%d years in the future"
 msgstr[0] "بعد عام واحد"
 msgstr[1] "بعد عامين"
 msgstr[2] "بعد %d أعوام"
-msgstr[3] "بعد %d عاماً"
+msgstr[3] "بعد %d عامًا"
 
 #: ../filter/filter-datespec.c:287
 msgid "<click here to select a date>"
@@ -10886,56 +11318,56 @@ msgstr "اختر ملف"
 msgid "Test"
 msgstr "إختبر"
 
-#: ../filter/filter-rule.c:815
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "اسم الق_اعدة:"
 
-#: ../filter/filter-rule.c:843
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "اعثر على العناصر التي تفي بالمعايير التالية"
 
-#: ../filter/filter-rule.c:877
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "أضِ_ف معيار المُرشِح"
 
-#: ../filter/filter-rule.c:883
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "إذا قوبلت جميع المعايير"
 
-#: ../filter/filter-rule.c:883
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "إذا قوبل أي معيار"
 
-#: ../filter/filter-rule.c:885
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_جِدْ عناصر:"
 
-#: ../filter/filter-rule.c:907
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "كل المتعلّق"
 
-#: ../filter/filter-rule.c:907
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "الردود"
 
-#: ../filter/filter-rule.c:907
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "الردود والأصول"
 
-#: ../filter/filter-rule.c:907
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "لا رد ولا أصل"
 
-#: ../filter/filter-rule.c:909
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "ضمّن المناق_شات"
 
-#: ../filter/filter-rule.c:1005 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "القادمة"
 
-#: ../filter/filter-rule.c:1005 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "الخارجة"
 
@@ -10949,7 +11381,7 @@ msgstr "لا يمكن تجميع التعابير النمطيّة &quot;{1}&quo
 
 #: ../filter/filter.error.xml.h:3
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "الملف &quot;{0}&quot; غير موجود أو أنّه ليس ملفّاً اعتياديّاً."
+msgstr "الملف &quot;{0}&quot; غير موجود أو أنّه ليس ملفًّا اعتياديًّا."
 
 #: ../filter/filter.error.xml.h:4
 msgid "Missing date."
@@ -10973,7 +11405,7 @@ msgstr "رجاء اختر اسما آخر."
 
 #: ../filter/filter.error.xml.h:9
 msgid "You must choose a date."
-msgstr "يجب أن تختار تاريخاً."
+msgstr "يجب أن تختار تاريخًا."
 
 #: ../filter/filter.error.xml.h:10
 msgid "You must name this filter."
@@ -11001,7 +11433,7 @@ msgid ""
 "12:00am of the date specified."
 msgstr ""
 "سيقارن تاريخ الرّسالة مع\n"
-"السّاعة 12:00 صباحاً من التّاريخ المحدّد."
+"السّاعة 12:00 صباحًا من التّاريخ المحدّد."
 
 #: ../filter/filter.glade.h:7
 msgid ""
@@ -11049,7 +11481,7 @@ msgstr "الوقت الذي تحدّده أنت"
 
 #: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:399
+#: ../plugins/google-account-setup/google-source.c:404
 msgid "weeks"
 msgstr "أسابيع"
 
@@ -11120,10 +11552,10 @@ msgstr "تحكّم تفضيلات بريد إيفُليوشِن"
 msgid "Evolution Network configuration control"
 msgstr "تحكّم إعداد تقويم إيفُليوشِن"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:610
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
-#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
-#: ../mail/mail-component.c:757
+#: ../mail/mail-component.c:595 ../mail/mail-component.c:596
+#: ../mail/mail-component.c:760
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "البريد"
@@ -11168,61 +11600,61 @@ msgstr ""
 #: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
-msgstr "انتقي مجلّداً"
+msgstr "انتقي مجلّدًا"
 
 #: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
 #: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:97
 msgid "Autogenerated"
-msgstr "مولّد آليّاً"
+msgstr "مولّد آليًّا"
 
 #: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "اسأل لكل رسالة"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "الهويّة"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "إستقبال بريد"
 
-#: ../mail/em-account-editor.c:2040
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "تحقق من الرسائل ال_جديدة كلَّ"
 
-#: ../mail/em-account-editor.c:2048
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "دقائ_ق"
 
-#: ../mail/em-account-editor.c:2222 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "إرسال بريد"
 
-#: ../mail/em-account-editor.c:2281 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "الإفتراضيّات"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2347 ../mail/mail-config.glade.h:130
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
 #: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "أمن"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2384 ../mail/em-account-editor.c:2475
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "خيارات التلقي"
 
-#: ../mail/em-account-editor.c:2385 ../mail/em-account-editor.c:2476
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "جار الفحص للبحث عن رسائل جديدة"
 
-#: ../mail/em-account-editor.c:2827 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "محرّر الحسابات"
 
-#: ../mail/em-account-editor.c:2827 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "مساعد حسابات إيفُليوشِن"
 
@@ -11240,7 +11672,7 @@ msgid "Protocol"
 msgstr "البرتوكول"
 
 #: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1157 ../mail/mail-signature-editor.c:478
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "غير مسمّى"
 
@@ -11256,18 +11688,18 @@ msgstr "أضِف برنامج توقيع نصي"
 msgid "Signature(s)"
 msgstr "التّوقيع (التّواقيع)"
 
-#: ../mail/em-composer-utils.c:1008 ../mail/em-format-quote.c:413
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- رسالة ممرّرة -------- "
 
-#: ../mail/em-composer-utils.c:1820
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "مرسِل مجهول"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1867
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11275,7 +11707,7 @@ msgstr ""
 "في ${AbbrevWeekdayName}، ${Day}-${Month}-${Year} عند ${24Hour}:${Minute} "
 "${TimeZone} ، كتب ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2010
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-------- الرسالة الأصلية -------- "
 
@@ -11296,10 +11728,6 @@ msgstr "عيّن لون"
 msgid "Assign Score"
 msgstr "عيّن نتيجة"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "المُرفقات"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
@@ -11316,10 +11744,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "اكتمل في"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "يحتوي"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "انسخ للمجلّد"
@@ -11344,10 +11768,6 @@ msgstr "احذف"
 msgid "Deleted"
 msgstr "حُذف"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "لا يحتوي"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "لا ينتهي بـ"
@@ -11368,10 +11788,6 @@ msgstr "لا يبدو كـ"
 msgid "does not start with"
 msgstr "لا يبدء بـ"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "غير موجود"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "مسوّدة"
@@ -11380,10 +11796,6 @@ msgstr "مسوّدة"
 msgid "ends with"
 msgstr "ينتهي بـ"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "موجود"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "موجود"
@@ -11396,14 +11808,10 @@ msgstr "تعبير"
 msgid "Follow Up"
 msgstr "متابعة"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1053
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "مهم"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "هو"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "يقع بعد"
@@ -11416,18 +11824,6 @@ msgstr "يقع قبل"
 msgid "is Flagged"
 msgstr "عليه علم"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "أكبر من"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "أصغر من"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "ليس"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "ليس عليه علم"
@@ -11576,13 +11972,13 @@ msgid "Unset Status"
 msgstr "ألغ ضبط الحالة"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "ثمّ"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
-msgstr "أضِف إجراءاً"
+msgstr "أضِف إجراءًا"
 
 #: ../mail/em-folder-browser.c:189
 msgid "C_reate Search Folder From Search..."
@@ -11624,11 +12020,11 @@ msgstr "الرسائل المهمّة"
 msgid "Messages Not Junk"
 msgstr "رسائل ليست نفاية"
 
-#: ../mail/em-folder-browser.c:1147
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "بحث الحسابات"
 
-#: ../mail/em-folder-browser.c:1200
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "بحث في كل الحسابات"
 
@@ -11656,7 +12052,16 @@ msgstr[3] "مجموع الرسائل:"
 msgid "Quota usage"
 msgstr "مجموع الرسائل:"
 
-#: ../mail/em-folder-properties.c:385
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
+#: ../mail/mail-component.c:583
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
+msgid "Inbox"
+msgstr "صندوق الدّاخل"
+
+#: ../mail/em-folder-properties.c:386
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "خصائص المجلّد"
@@ -11673,8 +12078,9 @@ msgstr "أن_شئ"
 msgid "Folder _name:"
 msgstr "ا_سم المجلّد:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "مجلدات البحث"
 
@@ -11683,124 +12089,89 @@ msgstr "مجلدات البحث"
 msgid "UNMATCHED"
 msgstr "غير مطابق"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "مسوّدات"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2535
-#: ../mail/mail-component.c:160
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:592
-msgid "Inbox"
-msgstr "صندوق الدّاخل"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "صندوق الصّادر"
 
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "أرسِل"
 
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "يجري التّحميل..."
 
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
-#. *
-#. * Most languages should translate this as "%s (%u)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:371
-#, c-format
-msgid "folder-display|%s (%u)"
-msgstr "%s (%u)"
-
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "شجرة مجلّد البريد"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "نقل المجلد %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "نسخ المجلد %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1954
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "نقل الرسائل إلى المجلّد %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1956
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "نسخ الرسائل إلى المجلّد %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "غير قادر على سحب الرسالة/الرسائل إلى مستوى التخزين العلوي"
 
-#: ../mail/em-folder-tree.c:994 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "ان_سخ للمجلّد"
 
-#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "ا_نقل للمجلّد"
 
-#: ../mail/em-folder-tree.c:1704 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "مسح الرسائل في \"%s\""
 
-#: ../mail/em-folder-tree.c:2077 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "ا_عرض"
-
-#: ../mail/em-folder-tree.c:2078
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "افتح في نافذة _جديدة"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "مجلّد _جديد..."
 
-#: ../mail/em-folder-tree.c:2086
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "ا_نقل..."
 
-#: ../mail/em-folder-tree.c:2093 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "أ_عِد التسمية..."
 
-#: ../mail/em-folder-tree.c:2094
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "أعِد الت_حميل"
 
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "ان_شر صندوق الصادِر"
 
-#: ../mail/em-folder-tree.c:2101 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "أ_فرٍغ المهملات"
 
@@ -11809,13 +12180,13 @@ msgstr "أ_فرٍغ المهملات"
 msgid "Copying `%s' to `%s'"
 msgstr "نسخ `%s' إلى `%s'"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1191
-#: ../mail/em-folder-view.c:1206
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "انتقي مجلّد"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1206
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
 msgid "C_opy"
 msgstr "ان_سخ"
 
@@ -11829,7 +12200,7 @@ msgstr "إنشاء المجلّد `%s'"
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
-msgstr "أنشيء مجلّد"
+msgstr "أنشئ مجلّد"
 
 #: ../mail/em-folder-utils.c:745
 #: ../plugins/groupwise-features/install-shared.c:168
@@ -11837,168 +12208,168 @@ msgstr "أنشيء مجلّد"
 msgid "Specify where to create the folder:"
 msgstr "حدّد أين سيتم إنشاء المجلّد:"
 
-#: ../mail/em-folder-view.c:1095 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "فشل حذف البريد"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ليست لديك تصاريح كافية لحذف هذا البريد."
 
-#: ../mail/em-folder-view.c:1334 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "_رد على المرسِل"
 
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:569 ../mail/em-popup.c:580
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_مرّر"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1340 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_حرّر كرسالةٍ جديدة..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1348
 msgid "U_ndelete"
 msgstr "ترا_جع عن الحذف"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1349
 msgid "_Move to Folder..."
 msgstr "ا_نقل للمجلّد..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1350
 msgid "_Copy to Folder..."
 msgstr "ان_سخ للمجلّد..."
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1353
 msgid "Mar_k as Read"
 msgstr "علّم ك _مقروءة"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Unread"
 msgstr "_علّم ك_غير مقروء"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Important"
 msgstr "_علّم على أنها _مهمّة"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as Un_important"
 msgstr "علّم على أنها غ_ير مهمّة"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Junk"
 msgstr "علّم ك_نفاية"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as _Not Junk"
 msgstr "علّم كليس _نفاية"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1359
 msgid "Mark for Follo_w Up..."
 msgstr "علّم للمتاب_عة..."
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1361
 msgid "_Label"
 msgstr "ت_سمية"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1360 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "لا _شيء"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1365
 msgid "_New Label"
 msgstr "لصيقة ج_ديدة"
 
-#: ../mail/em-folder-view.c:1367
+#: ../mail/em-folder-view.c:1369
 msgid "Fla_g Completed"
 msgstr "تم ال_علم"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1370
 msgid "Cl_ear Flag"
 msgstr "ا_مسح العلم"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1373
 msgid "Crea_te Rule From Message"
-msgstr "أنشيء قاعدة من الرّسالة"
+msgstr "أنشئ قاعدة من الرّسالة"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1375
 msgid "Search Folder based on _Subject"
 msgstr "مجلد بحث باعتبار الموضوع"
 
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1376
 msgid "Search Folder based on Se_nder"
 msgstr "مجلد بحث باعتبار المر_سل"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1377
 msgid "Search Folder based on _Recipients"
 msgstr "مجلد بحث باعتبار المست_لمين"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1378
 msgid "Search Folder based on Mailing _List"
 msgstr "مجلد بحث باعتبار القائمة البريدية"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1381
+#: ../mail/em-folder-view.c:1383
 msgid "Filter based on Sub_ject"
 msgstr "رشّح باعتبار المو_ضوع"
 
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1384
 msgid "Filter based on Sen_der"
 msgstr "رشّح باعتبار المر_سِل"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1385
 msgid "Filter based on Re_cipients"
 msgstr "رشّح باعتبار المست_لمين"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1386
 msgid "Filter based on _Mailing List"
 msgstr "رشّح باعتبار ال_قائمة البريديّة"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
 msgid "Default"
 msgstr "الإفتراض"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "لم أستطِع جلب الرسالة"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "يجري سحب الرسالة..."
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "م_كالمة إلى..."
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
-msgstr "انشيء مجلّد _بحث"
+msgstr "أنشئ مجلّد _بحث"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "_من هذا العنوان"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "إ_لى هذا العنوان"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "انقر لمراسلة %s"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "انقر للاتصال بـ %s"
 
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "انقر لإخفاء/إظهار العناوين"
 
@@ -12025,7 +12396,7 @@ msgstr "ال_تّالي"
 msgid "M_atch case"
 msgstr "_طابِق حالة الأحرف"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "غير موقّعة"
 
@@ -12035,7 +12406,7 @@ msgid ""
 "authentic."
 msgstr "هذه الرّسالة غير موقّعة. لا ضمان بأن هذه الرسالة أصليّة."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "توقيع سليم"
 
@@ -12045,7 +12416,7 @@ msgid ""
 "message is authentic."
 msgstr "هذه الرّسالة موقّعة و سليمة مما يعني أنها في الغالب أصليّة."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "توقيع غير صالح"
 
@@ -12055,7 +12426,7 @@ msgid ""
 "in transit."
 msgstr "لا يمكن التّحقّق من توقيع هذه الرّسالة، ربّما غُيّرت أثناء النّقل."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "توقيع صالح لكن تعذر التّحقّق من المرسِل"
 
@@ -12065,17 +12436,17 @@ msgid ""
 "cannot be verified."
 msgstr "هذه الرّسالة موقّعة بتوقيعٍ سليم، و لكن تعذر التّحقّق من مرسِل الرّسالة."
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
-msgstr "التوقيع موجود ولكنه يحتاج مفتاحاً عاماً"
+msgstr "التوقيع موجود ولكنه يحتاج مفتاحًا عامًا"
 
 #: ../mail/em-format-html-display.c:953
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
-msgstr "هذه الرّسالة موقّعة بتوقيع، ولكن لا مفتاح عام مرتبطاً بالتوقيع."
+msgstr "هذه الرّسالة موقّعة بتوقيع، ولكن لا مفتاح عام مرتبطًا بالتوقيع."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "غير مشفّرة"
 
@@ -12086,7 +12457,7 @@ msgid ""
 msgstr ""
 "هذه الرّسالة ليست مشفّرة. من الممكن مشاهدة محتواها أثناء نقلها عبر الإنترنت."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "مشفّرة، ضعيفة"
 
@@ -12099,7 +12470,7 @@ msgstr ""
 "هذه الرّسالة مشفّرة، و لكن بخوارزمية تشفير ضعيفة. سيصعب و لكن لن يستحيل على "
 "شخص خارجي مشاهدة محتوى هذه الرّسالة ضمن فترةٍ زمنيّة معقولة."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "مشفّرة"
 
@@ -12109,7 +12480,7 @@ msgid ""
 "the content of this message."
 msgstr "هذه الرّسالة مشفّرة. من الصعب على شخص خارجي مشاهدة محتواها."
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "مشفّرة، بقوّة"
 
@@ -12119,7 +12490,7 @@ msgid ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
-"هذه الرّسالة مشفّرة بخوارزمية تشفير قويّة. سيكون من الصّعب جدّاً على أيّ شخص خارجي "
+"هذه الرّسالة مشفّرة بخوارزمية تشفير قويّة. سيكون من الصّعب جدًّا على أيّ شخص خارجي "
 "أن يشاهد محتوى هذه الرّسالة ضمن فترةٍ زمنيّة معقولة."
 
 #: ../mail/em-format-html-display.c:1064 ../smime/gui/smime-ui.glade.h:48
@@ -12164,7 +12535,7 @@ msgstr "احفظ المرفق كـ"
 
 #: ../mail/em-format-html-display.c:1988
 msgid "Select folder to save all attachments"
-msgstr "اختر مجلداً لحفظ كل المرفقات"
+msgstr "اختر مجلدًا لحفظ كل المرفقات"
 
 #: ../mail/em-format-html-display.c:2039
 msgid "_Save Selected..."
@@ -12218,84 +12589,84 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "الصّفحة %d من %d"
 
-#: ../mail/em-format-html.c:501 ../mail/em-format-html.c:510
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "يجري سحب `%s'"
 
-#: ../mail/em-format-html.c:922
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "جزء المتن الخارجي غير معروف.."
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "جزء المتن الخارجي مشوّه."
 
-#: ../mail/em-format-html.c:960
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "مؤشّر لموقع FTP (%s)"
 
-#: ../mail/em-format-html.c:971
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "مؤشّر لملفٍّ محلّي (%s) صحيح في الموقع \"%s\""
 
-#: ../mail/em-format-html.c:973
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "مؤشّر لملف محلّي (%s)"
 
-#: ../mail/em-format-html.c:994
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "مؤشّر لبيانات بعيدة (%s)"
 
-#: ../mail/em-format-html.c:1005
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "مؤشّر لبيانات خارجيّة مجهولة (فئة \"%s\")"
 
-#: ../mail/em-format-html.c:1233
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "يجري تهيئة الرسالة"
 
-#: ../mail/em-format-html.c:1407
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "يجري تهيئة الرسالة..."
 
-#: ../mail/em-format-html.c:1560 ../mail/em-format-html.c:1624
-#: ../mail/em-format-html.c:1646 ../mail/em-format-quote.c:209
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "ن.ك"
 
-#: ../mail/em-format-html.c:1561 ../mail/em-format-html.c:1630
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "ن.ك.م"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1741 ../mail/em-format-quote.c:350
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "ساعي البريد"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1768
+#: ../mail/em-format-html.c:1771
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1773
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1904
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "أرسل <b>%s</b> هذه الرسالة بالنيابة عن <b>%s</b>"
@@ -12326,43 +12697,43 @@ msgstr "مجموعات أخبار"
 msgid "%s attachment"
 msgstr "مُرفق %s"
 
-#: ../mail/em-format.c:1197
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "لم يمكن تحليل رسالة S/MIME: خطأ مجهول"
 
-#: ../mail/em-format.c:1334 ../mail/em-format.c:1490
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "لم يمكن تحليل رسالة MIME. ستُعرض كمصدر."
 
-#: ../mail/em-format.c:1342
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "نوع تشفير غير مدعوم لعديد الأجزاء/مشفّر"
 
-#: ../mail/em-format.c:1352
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "تعذر تحليل رسالة PGP/MIME"
 
-#: ../mail/em-format.c:1352
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "تعذر تحليل رسالة PGP/MIME: خطأ مجهول"
 
-#: ../mail/em-format.c:1509
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "صيغة توقيع غير مدعومة"
 
-#: ../mail/em-format.c:1517 ../mail/em-format.c:1588
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "خطأ أثناء التّحقق من التّوقيع"
 
-#: ../mail/em-format.c:1517 ../mail/em-format.c:1579 ../mail/em-format.c:1588
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "خطأ مجهول أثناء التّحقّق من التّوقيع"
 
-#: ../mail/em-format.c:1660
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "تعذر تحليل رسالة PGP"
 
-#: ../mail/em-format.c:1660
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "تعذر تحليل رسالة PGP: خطأ مجهول"
 
@@ -12424,67 +12795,84 @@ msgid "No Junk plugin available"
 msgstr "لا يوجد ملحق بريد مهمل متاح."
 
 #. green
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "للقيام به"
 
 #. blue
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1060
 msgid "Later"
-msgstr "لاحقاً"
+msgstr "لاحقًا"
 
-#: ../mail/em-migrate.c:1210
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"لقد تغيرت مواقع و هرميّة مجلّدات صندوق بريد إيفُليوشِن منذ إيفُليوشِن 1.x.\n"
-"\n"
-"رجاء كن صبوراً حتى يقوم إيفُليوشِن بترقية مجلّداتك..."
+#: ../mail/em-migrate.c:1247
+#, fuzzy, c-format
+msgid "Migrating '%s':"
+msgstr "يجري ترقية `%s':"
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "تعذر إنشاء المجلّد الجديد `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "تعذر نسخ المجلد `%s' إلى `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "تعذر المسح بحثا عن صناديق بريد في `%s': %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:1868
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"لقد تغيرت مواقع و هرميّة مجلّدات صندوق بريد إيفُليوشِن منذ إيفُليوشِن 1.x.\n"
+"\n"
+"رجاء كن صبورًا حتى يقوم إيفُليوشِن بترقية مجلّداتك..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "تعذر فتح بيانات POP keep-on-server قديمة `%s': %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "تعذر إنشاء دليل بيانات POP3 keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "تعذر نسخ بيانات POP3 keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "تعذر إنشاء مخزن بريد محلّي `%s': %s"
 
-#: ../mail/em-migrate.c:2851
+#: ../mail/em-migrate.c:2898
+#, fuzzy
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"لقد تغيرت مواقع و هرميّة مجلّدات صندوق بريد إيفُليوشِن منذ إيفُليوشِن 1.x.\n"
+"\n"
+"رجاء كن صبورًا حتى يقوم إيفُليوشِن بترقية مجلّداتك..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "تعذر إنشاء مجلّدات البريد المحلّية في `%s': %s"
 
-#: ../mail/em-migrate.c:2870
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12521,7 +12909,7 @@ msgstr "مجلّد"
 #. FIXME: This is just to get the shadow, is there a better way?
 #: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
-msgstr "رجاء اختر خادوماً."
+msgstr "رجاء اختر خادومًا."
 
 #: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
@@ -12583,7 +12971,7 @@ msgstr "السماح لإيفُليوشن بعرض جزء نصي بحجم محد
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
-msgstr "أطلب دائما إخطاراً بالقراءة لهذه الرسالة"
+msgstr "أطلب دائما إخطارًا بالقراءة لهذه الرسالة"
 
 #: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
@@ -12632,11 +13020,17 @@ msgid ""
 msgstr "اضغط عرض العناوين في إلى/ن.ك/ن.ك.م إلى الرقم المحدد في address_count."
 
 #: ../mail/evolution-mail.schemas.in.h:17
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:18
 #, fuzzy
 msgid "Custom headers to use while checking for junk."
 msgstr "تحدد الترويسة للتأكد من البريد النفاية."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:19
 #, fuzzy
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
@@ -12644,70 +13038,70 @@ msgid ""
 msgstr ""
 "تحدد الترويسة للتأكد من البريد النفاية. النسق هو headername=value في gconf."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "الترميز الافتراضي لكتابة الرسائل"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "الترميز الافتراضي لكتابة الرسائل."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "الترميز الافتراضي لعرض الرسائل"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "الترميز الافتراضي لعرض الرسائل."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "أسلوب التمرير الإفتراضي"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "العلو الإفتراضي لنافذة المؤلّف. "
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "الارتفاع الإفتراضي لنافذة الرسائل."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "الإرتفاع الافتراضي لمربع حوار الاشتراك."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "أسلوب الرّد الإفتراضي"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "القيمة الافتراضية لحالة توسيع المناقشة"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "العرض الإفتراضي لنافذة المؤلّف. "
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "العرض الإفتراضي لنافذة الرسائل."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "العرض الافتراضي لمربع حوار الاشتراك."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:33
 #, fuzzy
 msgid ""
 "Determines whether to look up addresses for junk filtering in local "
 "addressbook only"
 msgstr "يحدد فيما إذا سيَبحث في دفتر العناوين عن البريد الكتروني للمرسِل"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr "يحدد فيما إذا سيَبحث في دفتر العناوين عن البريد الكتروني للمرسِل"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12718,11 +13112,11 @@ msgstr ""
 "يجب أن يكون سخاما. سيبحث في الدفاتر المُعلَّمة للاتمام التلقائي. قد يكون بطيئا، "
 "إذا تم تعليم دفاتر العناوين البعيدة (مثل ldap) للاتمام التلقائي."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "يحدد ما إذا سيستخدم ترويسات مُخصصة للتأكد من البريد النفاية "
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12731,7 +13125,7 @@ msgstr ""
 "يحدد ما إذا سيستخدم ترويسات مُخصصة للتأكد من البريد النفاية. إذا تم تمكين هذا "
 "الخيار وتم ذكر الترويسات، فسيتم تحسين سرعة التأكد من البريد النفاية."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -12739,59 +13133,59 @@ msgstr ""
 "يحدد ما إذا سيستخدم نفس الخطوط لكل من خطي \"من\" و\"الموضوع\" في عمود "
 "\"الرسائل\" داخل المشهد العمودي."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "دليل حفظ/إرفاق ملفات للمؤلِّف."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "دليل حفظ ملفات محتوى البريد."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "ارسم مؤشّرات لأخطاء التّهجئة على الكلمات بينما تكتب أنت."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "أفرغ مجلّدات البريد المهمل عند الخروج"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "أفرغ مجلّدات المهملات عند الخروج"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "أفرغ جميع مجلّدات البريد المهمل عند الخروج من إيفُليوشِن."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "أفرغ جميع مجلّدات المهملات عند الخروج من إيفُليوشِن."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "فعل طور المؤشّر، حتّى يمكنك رؤية مؤشّر عند قراءة البريد."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "فعّل أو عطل مفتاح الفراغ السحري"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "فعّل أو عطل ميزة البحث أثناء الكتابة"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "فعِّل مجلدات البحث"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "فعِّل مجلّدات البحث عند بداية التشغيل."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12800,9 +13194,9 @@ msgid ""
 msgstr ""
 "تفعيل ميزة بحث الشريط الجانبي لكي تستطيع أن تبدأ البحث التفاعلي عن طريق "
 "كتابة النص. يستخدم هذا لإيجاد مجلد في الشريط الجانبي عن طريق مجرد كتابة اسم "
-"المجلد، وسيتم انتقاؤه آلياً."
+"المجلد، وسيتم انتقاؤه آليًا."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12810,27 +13204,27 @@ msgstr ""
 "مَكِّن هذا لاستخدام مفتاح الفراغ للتنقل في معاينة الرسالة و لائحة الرسائل "
 "والمجلدات. "
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "فعِّل لرسم الجزء النصي من الرسالة ذا الحجم المحدود."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "فعّل/عطّل طور المؤشّر"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "ارتفاع لوح قائمة الرّسائل"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "ارتفاع لوح قائمة الرّسائل."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "يخفي المعاينة حسب المجلد ويزيل التحديد"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12838,14 +13232,14 @@ msgstr ""
 "اذا حاول مستخدم فتح اكثر من 10 رسائل أو أكثر في وقت واحد اسأل المستخدم اذا "
 "كان حقا يريد ذلك."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 msgstr ""
-"عرض لوح المعاينة إذا كان مفعلا جنباً إلى جنب مع قائمة الرسائل بدلا من تحتها."
+"عرض لوح المعاينة إذا كان مفعلا جنبًا إلى جنب مع قائمة الرسائل بدلا من تحتها."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12855,13 +13249,13 @@ msgstr ""
 "مايم يظهر في هذه القائمة يربط مع عارض مكون بونوبو في قاعدة بيانات مايم "
 "التابعة لجنوم لعرض المحتوى."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -12870,24 +13264,24 @@ msgid ""
 "detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "لتفعيل أو تعطيل المحث أثناء وضع علامات على عدة رسائل."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
 msgstr ""
 "يعطّل الميزة حيث تظهر محثات متكررة للسؤال إن كانت المزامنة دون اتصال مطلوبة."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -12896,31 +13290,31 @@ msgstr ""
 "تعطل/تمكن الحَثَّ المتكرر من التحذير على أن حذف الرسائل من مجلد البحث يقوم فعلا "
 "بالحذف النهائي للرسالة، وليس فقط إزالتها من نتائج البحث."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "آخر مرة أفرغت فيها البريد المهمل"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "آخر مرة أفرغت فيها سلة المهملات"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "المستوى الذي إذا تم تجاوزه يَتَوجب تسجيل الرسالة."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "قائمة بالتسميات والألوان المرتبطة بها"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "قائمة بالتراخيص المقبولة"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "قائمة بالحسابات"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12928,15 +13322,15 @@ msgstr ""
 "قائمة  بالحسابات المعروفة لمكون البريد في إيفُليوشن. تحتوي القائمة على أسامي "
 "مجلدات بالنسبة إلى /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "قائمة بالترويسات المخصّصة وما إذا كانت مفعّلة أم لا."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12944,125 +13338,126 @@ msgstr ""
 "قائمة بالتسميات المعروفة لمكون البريد في إيفُليوشن. تحتوي القائمة على سطور "
 "بها الاسم:اللون واللون يكتب بترميز HTML ستي."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "قائمة أنواع mime للتفقدها من أجل عارضات مكوّنات بونوبو"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "قائمة بأسماء البروتوكولات التي قُبِلت تراخيصُها."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "حمّل صور رسائل HTML عبر http"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
+#, fuzzy
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net. 1 - Load images in messages from contacts. 2 - "
-"Always load images off the net."
+"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
 msgstr ""
 "حمِّل الصور لرسائل HTML عبر http(s). القيم الممكنة هي: 0 - لا تحمِّل الصور عبر "
 "انترنت 1 - حمِّل الصور في البريد من المراسَلين 2 - حمِّل الصور دوما من انترنتً."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "سجّل إجراءات المرشِّح"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "سجّل إجراءات المرشِّح على ملف السّجل المحدّد."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "ملف السّجل لتسجيل إجراءات المرشِّح"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "ملف السّجل لتسجيل إجراءات المرشِّح."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "علّم كمُراجَع بعد المهلة المحدّدة"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "علّم كمُراجَع بعد المهلة المحدّدة."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "علّم الاقتباسات في \"معاينة\" الرّسالة"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "علّم الاقتباسات في \"معاينة\" الرّسالة."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "ارتفاع نافِذة الرسائل الإفتراضي"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "العرض الافتراضي لنافذة الرسالة"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "أسلوب عرض الرسائل (\"عادي\", \"ترويسات كاملة\", \"المصدر\")"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "الفترة الدنيا بالأيام لإفراغ البريد المهمل عند الخروج"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "الحد الأدنى بالأيام بين مرات إفراغ سلة المهملات عند الخروج"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "الوقت الأدني بين مرات إفراغ سلة المهملات عند الخروج، بالأيام."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "الوقت الأدني بين مرات إفراغ سلة المهملات عند الخروج، بالأيام."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "عدد العناوين التي يتم إظهارها في الحقول من ون.ك ون.ك.م"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "المساءلة عن موضوع خالي"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "مساءلة المستخدم عندما يحاول محو مجلّد."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "مساءلة المستخدم عندما يحاول إرسال رسالةٍ دون موضوع."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
-msgstr "المساءلة للتحقق إن كان المستخدم يريد الذهاب إلى نمط دون اتصال فوراً"
+msgstr "المساءلة للتحقق إن كان المستخدم يريد الذهاب إلى نمط دون اتصال فورًا"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "السؤال عند حذف رسائل من مجلد البحث"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "المساءلة حين يقوم المستخدم بالمحو"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "المساءلة حين لا يملأ المستخدم سوى حقل النّسخة الكربونيّة المخفيّة"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "السؤال عند محاولة المستخدم فتح ١٠ رسائل أو أكثر دفعة واحدة"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13070,141 +13465,147 @@ msgstr ""
 "المساءلة حين يحاول المستخدم إرسال بريد HTML إلى مستلمين قد لا يرغبون باستلام "
 "بريد HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "المساءلة حين يحاول المستخدم إرسال رسالةٍ دون مستلمي \"إلى\" أو \"نسخة كربونيّة"
 "\"."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "المساءلة حين يحاول المستخدم إرسال HTML غير مرغوبٍ فيه"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "السؤال عند تعليم رسائل متعددة"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "تعرّف آليا على التعابير الرسومية في النّص و استبدلها بالصّور."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "التّعرّف على الوصلات في النّص و الاستبدال بها."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "تنفيذ اختبار النفاية على البريد الوارد."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "دليل الحفظ"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Search for the sender photo in local addressbooks"
 msgstr "البحث عن صورة المرسل في دفاتر العناوين المحلية"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
-msgstr "أرسِل بريد HTML افتراضياً"
+msgstr "أرسِل بريد HTML افتراضيًا"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
-msgstr "أرسِل بريد HTML افتراضياً."
+msgstr "أرسِل بريد HTML افتراضيًا."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "أظهر عمود عنوان بريد المرسل في قائمة الرسائل"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
+#, fuzzy
+msgid "Server synchronization interval"
+msgstr "خيارات ال_مزامنة..."
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "أظهر الرّسوم المتحرّكة"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "اظهر الصّور المتحرّكة كرسوم متحرّكة."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "اظهر الرّسائل المحذوفة (بخطٍّ يشطبها) في قائمة الرّسائل."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "اظهر الرّسائل المحذوفة في قائمة الرّسائل"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "أظهر صورة المُرسِل"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "اظهر البريد الإلكتروني للمرسل في عمود منفصل على قائمة الرسائل."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "أظهر صورة المرسل في لوح قراءة الرسالة."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "فحص تهجئة ضمن السّياق"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 #, fuzzy
 msgid "Spell checking color"
 msgstr "التثبت من التهجئة"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 #, fuzzy
 msgid "Spell checking languages"
 msgstr "فحص تهجئة ضمن السّياق"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "الإرتفاع الافتراضي لمربع حوار الاشتراك"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "العرض الافتراضي لمربع حوار الاشتراك"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "خط الشاشة الطرفيّة"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "حد الجزء النصي من الرسالة"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "الملحق الإضافي لموضع إضافة البريد المهمل في الروتين"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr ""
 "آخر مرة تم فيها إفراغ البريد المهمل، محسوبة بالأيام منذ تاريخ بدء الحساب."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 "آخر مرة تم فيها إفراغ سلة المهملات، محسوبة بالأيام منذ تاريخ بدء الحساب."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "خط الشاشة الطرفيّة لعرض البريد."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "الخط المتغيّر العرض لعرض البريد."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
+#, fuzzy
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr "هناك ثلاث قيم ممكنة. 0 للأخطاء. 1 للتحذيرات. 2 لرسائل التنقيح."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -13212,46 +13613,47 @@ msgstr ""
 "هذا يحدد الحجم الأقصى للجزء النصي الذي يمكن تهيئته في إيفُليوشن. القيمة "
 "الافتراضية هي ٤ ميجابايت / ٤٠٩٦ كيلوبايت ويتم تحديده بالكيلوبايت."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 msgstr ""
 "هذا هو ملحق البريد المهمل الافتراضي، رغم أن هناك عدة ملحقات مفعّلة. إذا عُطّل "
-"الملحق المسرود افتراضياً، فلن يتم التراجع إلى الملحقات الأخرى المتاحة."
+"الملحق المسرود افتراضيًا، فلن يتم التراجع إلى الملحقات الأخرى المتاحة."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
+#, fuzzy
 msgid ""
-"This key is read only once and reset to false after read. This unselects the "
-"mail in the list and removes the preview for that folder."
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
 msgstr ""
 "المفتاح يُقرأ مرة واحدة ويعاد ضبطه إلى خطأ بعد القراءة. هذا سوف يلغي تحديد "
 "البريد في القائمة وسوف يزيل معاينة ذلك المجلد."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 msgstr ""
-"هذا المفتاح يتضمن قائمة بكل بنيات XML محدداً الترويسات المخصصة، وما إذا كان "
+"هذا المفتاح يتضمن قائمة بكل بنيات XML محددًا الترويسات المخصصة، وما إذا كان "
 "يجب إظهارها. هيئة بنية XML هي &lt;header enabled&gt; - عينها إلى مُفعَّل إن كان "
 "يجب عرض الترويسة في مشهد البريد."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local addressbook only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "هذا الخيار سيساعد في تحسين سرعة الجلب."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13259,15 +13661,15 @@ msgstr ""
 "هذا يعين عدد العناوين التي يتم إظهارها في مشهد قائمة الرسائل الافتراضي، "
 "والذي إذا زادت عنه يتم إظهار '...'."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr ""
 "هذا الإعداد يحدد ما إذا كانت المناقشات ستكون في حالة التوسيع أو الطيّ "
-"افتراضياً. سيحتاج إيفوليوشن أن تعيد تشغيله."
+"افتراضيًا. سيحتاج إيفوليوشن أن تعيد تشغيله."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13276,28 +13678,18 @@ msgstr ""
 "هذا الإعداد يحدد ما إذا كانت المناقشات ستُفرز بناء على آخر رسالة في كل نقاش "
 "بدل الفرز بتاريخ الرسالة. سيحتاج إيفوليوشن أن تعيد تشغيله."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "تشعيب قائمة الرّسائل."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "تشعيب قائمة الرّسائل"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "تشعيب قائمة الرّسائل حسب الموضوع"
 
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "Time interval, in seconds, how often upload store changes to server."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid ""
-"Time interval, in seconds, how often upload store changes to server. The "
-"actual value cannot be less than 30 seconds."
-msgstr ""
-
 #: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "مهلة قبل تعليم الرسالة كمقروءة"
@@ -13400,7 +13792,7 @@ msgid ""
 "not contain In-Reply-To or References headers."
 msgstr ""
 "ما إن كان يجب الاعتماد على التخييط حسب الموضوع عندما لا تحتوي الرسائل على "
-"الترويسات \"رداً على\" أو \"مراجع\"."
+"الترويسات \"ردًا على\" أو \"مراجع\"."
 
 #: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
@@ -13432,7 +13824,7 @@ msgstr "المجلد الوجهة:"
 
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
-msgstr "انتقاء مجلداً للاستيراد إليه"
+msgstr "انتقاء مجلدًا للاستيراد إليه"
 
 #: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
@@ -13492,7 +13884,14 @@ msgstr "قائمة %s البريديّة"
 msgid "Add Filter Rule"
 msgstr "أضِف قاعدة مرشحة"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#, fuzzy
+msgid "Templates"
+msgstr "قالب:"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -13501,7 +13900,7 @@ msgstr[1] "اثنان مُنتقيان، "
 msgstr[2] "%d منتقاة، "
 msgstr[3] "%d منتقاة، "
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -13510,7 +13909,7 @@ msgstr[1] "%d حُذف"
 msgstr[2] "%d حُذف"
 msgstr[3] "%d حُذف"
 
-#: ../mail/mail-component.c:558
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -13519,7 +13918,7 @@ msgstr[1] "%d نفاية"
 msgstr[2] "%d نفاية"
 msgstr[3] "%d نفاية"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -13528,7 +13927,7 @@ msgstr[1] "%d مسوّدة"
 msgstr[2] "%d مسوّدة"
 msgstr[3] "%d مسوّدة"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -13537,7 +13936,7 @@ msgstr[1] "%d أُرسِل"
 msgstr[2] "%d أُرسِل"
 msgstr[3] "%d أُرسِل"
 
-#: ../mail/mail-component.c:565
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -13546,7 +13945,7 @@ msgstr[1] "%d غير مُرسَل"
 msgstr[2] "%d غير مُرسَل"
 msgstr[3] "%d غير مُرسَل"
 
-#: ../mail/mail-component.c:571
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -13555,96 +13954,88 @@ msgstr[1] "%d غير مقروء"
 msgstr[2] "%d غير مقروء"
 msgstr[3] "%d غير مقروء"
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
-msgstr[0] "%d إجمالياً"
-msgstr[1] "%d إجمالياً"
-msgstr[2] "%d إجمالياً"
-msgstr[3] "%d إجمالياً"
+msgstr[0] "%d إجماليًا"
+msgstr[1] "%d إجماليًا"
+msgstr[2] "%d إجماليًا"
+msgstr[3] "%d إجماليًا"
 
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:916
 msgid "New Mail Message"
 msgstr "رسالة بريديّة جديدة"
 
-#: ../mail/mail-component.c:914
-msgid "_Mail Message"
-msgstr "_رسالة بريديّة"
-
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:918
 msgid "Compose a new mail message"
 msgstr "تأليف رسالة بريديّة جديدة"
 
-#: ../mail/mail-component.c:921
+#: ../mail/mail-component.c:924
 msgid "New Mail Folder"
 msgstr "مجلد بريد جديد"
 
-#: ../mail/mail-component.c:922
-msgid "Mail _Folder"
-msgstr "م_جلد بريد"
-
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:926
 msgid "Create a new mail folder"
-msgstr "انشيء مجلد بريد جديد"
+msgstr "أنشئ مجلد بريد جديد"
 
-#: ../mail/mail-component.c:1070
+#: ../mail/mail-component.c:1073
 msgid "Failed upgrading Mail settings or folders."
 msgstr "فشل تحديث إعدادات أو مجلدات البريد"
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1586
 msgid "Error"
 msgstr "خطأ"
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1586
 msgid "Errors"
 msgstr "أخطاء"
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1587
 msgid "Warnings and Errors"
 msgstr "أخطاء و تنبيهات"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1588
 msgid "Debug"
 msgstr "نقّح"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1588
 msgid "Error, Warnings and Debug messages"
 msgstr "خطأ، تحذيرات ورسائل التنقيح"
 
-#: ../mail/mail-component.c:1712
+#: ../mail/mail-component.c:1715
 msgid "Debug Logs"
 msgstr "نقِّح السجلات"
 
-#: ../mail/mail-component.c:1726
+#: ../mail/mail-component.c:1729
 msgid "Show _errors in the status bar for"
 msgstr "أظهر الأ_خطاء في شريط المعلومات من أجل"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1742
+#: ../mail/mail-component.c:1745
 #, fuzzy
 msgid "second(s)."
 msgstr "ثوان."
 
-#: ../mail/mail-component.c:1748
+#: ../mail/mail-component.c:1751
 msgid "Log Messages:"
 msgstr "رسائل السجل:"
 
-#: ../mail/mail-component.c:1789
+#: ../mail/mail-component.c:1792
 msgid "Log Level"
 msgstr "مستوى الولوج"
 
-#: ../mail/mail-component.c:1798 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "الوقت"
 
-#: ../mail/mail-component.c:1808 ../mail/message-list.c:2386
+#: ../mail/mail-component.c:1811 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "رسائل"
 
-#: ../mail/mail-component.c:1817 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "غلق هذه النافذة"
@@ -13660,7 +14051,7 @@ msgstr "(ملاحظة: يتطلب إعادة تشغيل التطبيق)"
 #: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr ""
-"<b>الاتصال الآمن بواسطة SSL ليس مدعوماً بواسطة هذه النسخة من إيفُليوشن</b>"
+"<b>الاتصال الآمن بواسطة SSL ليس مدعومًا بواسطة هذه النسخة من إيفُليوشن</b>"
 
 #: ../mail/mail-config.glade.h:5
 #, fuzzy
@@ -13779,27 +14170,27 @@ msgstr "إدارة الحسابات"
 
 #: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
-msgstr "أضِف تو_قيعاً جديداً..."
+msgstr "أضِف تو_قيعًا جديدًا..."
 
 #: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
-msgstr "أضِف _برنامجاً نصياً"
+msgstr "أضِف _برنامجًا نصيًا"
 
 #: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
-msgstr "وقع الرسائل دائماً عند استخدام هذا الحساب"
+msgstr "وقع الرسائل دائمًا عند استخدام هذا الحساب"
 
 #: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr "شفر أيضاً لل_نّفس عند إرسال بريد مشفر"
+msgstr "شفر أيضًا لل_نّفس عند إرسال بريد مشفر"
 
 #: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "أرسل نسخة كربونية (ن.ك) دوماً إلى:"
+msgstr "أرسل نسخة كربونية (ن.ك) دومًا إلى:"
 
 #: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "أرسل نسخة كربونية مخفية (ن.ك.م) دوماً إلى:"
+msgstr "أرسل نسخة كربونية مخفية (ن.ك.م) دومًا إلى:"
 
 #: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
@@ -13815,7 +14206,7 @@ msgstr "اطلب دائما إخطارا بالقراءة"
 
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
-msgstr "أدرج التعابير المرسومة آلياً"
+msgstr "أدرج التعابير المرسومة آليًا"
 
 #: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
@@ -13836,11 +14227,11 @@ msgstr "فح_ص الأنواع المدعومة"
 #: ../mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Check cu_stom headers for junk"
-msgstr "ف_حص الترويسات المخصصة بحثاً عن النفايات"
+msgstr "ف_حص الترويسات المخصصة بحثًا عن النفايات"
 
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
-msgstr "فحص الرسائل ال_واردة بحثاً عن النفايات"
+msgstr "فحص الرسائل ال_واردة بحثًا عن النفايات"
 
 #: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
@@ -13878,7 +14269,7 @@ msgstr ""
 "تهانينا، لقد تمّ إعداد بريدك.\n"
 "\n"
 "إنّك جاهزٌ الآن لإرسال و تلقي البريد الإلكتروني \n"
-"مستعملاً افُليوشِن.\n"
+"مستعملًا افُليوشِن.\n"
 "\n"
 "الرجاء نقر \"طبق\" لحفظ إعداداتك."
 
@@ -13896,10 +14287,11 @@ msgstr "احذف رسائل البريد النفاية عند ال_خروج"
 
 #: ../mail/mail-config.glade.h:70
 msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "توقي_ع الرسائل الصادرة رقمياً (إفتراضياً)"
+msgstr "توقي_ع الرسائل الصادرة رقميًا (إفتراضيًا)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+#, fuzzy
+msgid "Do not format messages when text si_ze exceeds"
 msgstr "لا تهيئ محتويات النص في الرسائل إن تجاوز ح_جم النص"
 
 #: ../mail/mail-config.glade.h:72
@@ -13946,7 +14338,7 @@ msgstr "شهادة الت_شفير:"
 
 #: ../mail/mail-config.glade.h:82
 msgid "Encrypt out_going messages (by default)"
-msgstr "تشفير الرسائل ال_صادرة (إفتراضياً)"
+msgstr "تشفير الرسائل ال_صادرة (إفتراضيًا)"
 
 #: ../mail/mail-config.glade.h:84
 msgid "Fi_xed-width:"
@@ -14038,35 +14430,40 @@ msgid ""
 msgstr "ملاحظة: لن تسأل عن كلمة السر حتى تتصل لأوّل مرّة"
 
 #: ../mail/mail-config.glade.h:109
+#, fuzzy
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "سيُتجاوز هذا الخيار إذا ما وُجد تطابق مع ترويسات مخصصة لبريد نفاية. "
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "ال_منظّمة:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "هوية _مفتاح PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Pass_word:"
 msgstr "_كلمة السر:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"رجاء أدخل اسماً لوصف هذا الحساب في المساحة أدناه.\n"
+"رجاء أدخل اسمًا لوصف هذا الحساب في المساحة أدناه.\n"
 "سيتم استعمال هذا الاسم لأغراض العرض فقط."
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"رجاء أدخل معلومات حول الطريقة التي سترسل بواسطتها البريد. ان لم تكن متأكداً، "
+"رجاء أدخل معلومات حول الطريقة التي سترسل بواسطتها البريد. ان لم تكن متأكدًا، "
 "اسأل مدير نظامك أو مزود خدمة انترنت."
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14075,122 +14472,122 @@ msgstr ""
 "رجاءً أدخل اسمك وبريدك الإلكتروني أدناه. أنت غير ملزم بملء الحقول \"الاختيارية"
 "\" أدناه، إلا إذا كنت ترغب في تضمين هذه المعلومات في الريد الذي ترسله."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "الرجاء الانتقاء من الخيارات التالية"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Port:"
 msgstr "ال_منْفذ:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "السؤال عند إرسال الرسائل مع تحديد لمتلقّي النسخ الكربونيّة المخفيّة فقط"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "مقتبس"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "ت_ذكر كلمة السر"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "رد على:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "تذكر _كلمة السر"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "ابح_ث عن صورة المرسل فقط في دفاتر العناوين المحلية"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "انت_قاء..."
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "أرسل إخطارات الو_صول:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "الخط القيا_سي:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "انتقاء خط HTML الثّابت العرض"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "إنتقاء خط HTML الثّابت العرض للطّباعة"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "إنتقاء خط HTML المتغيّر العرض"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "إنتقاء خط HTML المتغيّر العرض للطّباعة"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "يجري إرسال البريد"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "مجلد الرسا_ئل المرسلة:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "يتطلب ال_خادوم التوثّق"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_نوع الخادوم:"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "شهادة التّو_قيع:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "التّو_قيع:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "توقيعات"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "جدول التوقيعات"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "التثبت من التهجئة"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
 msgid "Start _typing at the bottom on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "النو_ع "
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "قائمة اللغات الموجودة هنا لا تعكس إلا اللغات التي يوجد لها قاموس مركب."
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14200,11 +14597,6 @@ msgstr ""
 "كتوقيع لك. الاسم الذي تحدده سيتم استخدامه\n"
 "لأغراض العرض فقط."
 
-#: ../mail/mail-config.glade.h:151
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr "سيُتجاوز هذا الخيار إذا ما وُجد تطابق مع ترويسات مخصصة لبريد نفاية. "
-
 #: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -14224,7 +14616,8 @@ msgid "Use Authe_ntication"
 msgstr "التوثق"
 
 #: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:359
+#: ../plugins/google-account-setup/google-source.c:364
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "ا_سم المستخدم:"
 
@@ -14248,7 +14641,7 @@ msgstr "أضِف توقيع"
 
 #: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
-msgstr "حمل الصور من إنترنت دائماً"
+msgstr "حمل الصور من إنترنت دائمًا"
 
 #: ../mail/mail-config.glade.h:163
 #, fuzzy
@@ -14299,14 +14692,15 @@ msgstr "ت_عليم الرسائل على أنها قُرأت بعد"
 
 #: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
-msgstr "لا تحمل صورأ من إنترنت أبداً"
+msgstr "لا تحمل صورأ من إنترنت أبدًا"
 
 #: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "ال_مسار:"
 
 #: ../mail/mail-config.glade.h:178
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#, fuzzy
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "السؤال عند إرسال رسائل HTML للمراسَلين الذي لا يريدونها"
 
 #: ../mail/mail-config.glade.h:179
@@ -14403,43 +14797,43 @@ msgstr "حساس ل_حالة الأحرف"
 msgid "Co_mpleted"
 msgstr "مُنج_ز"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "اي_جاد:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "أوجد في الرسالة"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
 msgid "Flag to Follow Up"
 msgstr "علم للمتابعة"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "إشتراكات المجلّدات"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "اتفاقية الترخيص"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "لا شيء منتقى"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "النّا_دل:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "معلومات الأمن"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "مجلدات محددة"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14447,19 +14841,19 @@ msgstr ""
 "الرسائل التي انتقيتها للمتابعة موجودة أدناه.\n"
 "رجاء انتق إجراء متابعة من قائمة \"علم\"."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "إ_قبل الترخيص"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "تاريخ الاستحقا_ق:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "ال_علم:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "علم هذا لقبول اتفاقية الترخيص"
 
@@ -14489,7 +14883,7 @@ msgid ""
 "Appending to local `Sent' folder instead."
 msgstr ""
 "فشل الإلحاق إلى %s: %s\n"
-"سيتم الإلحاق إلى مجلد `أُرسل' المحلي بدلاً منه."
+"سيتم الإلحاق إلى مجلد `أُرسل' المحلي بدلًا منه."
 
 #: ../mail/mail-ops.c:618
 #, c-format
@@ -14603,9 +14997,9 @@ msgstr[2] "يجري سحب %d رسالة"
 msgstr[3] "يجري سحب %d رسالة"
 
 #: ../mail/mail-ops.c:1978
-#, c-format
+#, fuzzy, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "يجري حفظ %d رسالة"
 msgstr[1] "يجري حفظ %d رسالة"
 msgstr[2] "يجري حفظ %d رسالة"
@@ -14710,11 +15104,6 @@ msgstr "عملية ألغاها المستخدم."
 msgid "_Save and Close"
 msgstr "احفظ و أغلق"
 
-#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_ملف"
-
 #: ../mail/mail-signature-editor.c:355
 #, fuzzy
 msgid "Edit Signature"
@@ -14764,23 +15153,23 @@ msgstr "يجري تحديث مجلدات البحث لـ'%s:%s'"
 msgid "Updating Search Folders for '%s'"
 msgstr "يجري تحديث مجلدات البحث لـ'%s'"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "تحرير مجلد البحث"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "مجلد بحث جديد"
 
 #: ../mail/mail.error.xml.h:1
 #, fuzzy
 msgid "A folder named \"{0}\" already exists. Please use a different name."
-msgstr "يوجد مجلد بالاسم &quot;{1}&quot; مسبقاً. رجاء حدد اسماً مختلفاً."
+msgstr "يوجد مجلد بالاسم &quot;{1}&quot; مسبقًا. رجاء حدد اسمًا مختلفًا."
 
 #: ../mail/mail.error.xml.h:2
 #, fuzzy
 msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "يوجد مجلد بالاسم &quot;{1}&quot; مسبقاً. رجاء حدد اسماً مختلفاً."
+msgstr "يوجد مجلد بالاسم &quot;{1}&quot; مسبقًا. رجاء حدد اسمًا مختلفًا."
 
 #: ../mail/mail.error.xml.h:3
 #, fuzzy
@@ -14790,7 +15179,7 @@ msgid ""
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 msgstr ""
-"يوجد مجلد غير فارغ في &quot;{1}&quot; مسبقاً.\n"
+"يوجد مجلد غير فارغ في &quot;{1}&quot; مسبقًا.\n"
 "\n"
 "يمكنك أن تختار إما تجاهل هذا المجلد أو الكتابة فوقه أو الإلحاق إلى محتوياته "
 "أو الإنهاء."
@@ -14807,7 +15196,7 @@ msgstr "تم طلب إخطار الوصول لـ&quot;{1}&quot;. إرسال إخ
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
-msgstr "توقيع بالاسم &quot;{0}&quot; موجود مسبقاً. رجاءً حدد اسماً آخر."
+msgstr "توقيع بالاسم &quot;{0}&quot; موجود مسبقًا. رجاءً حدد اسمًا آخر."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -14838,7 +15227,7 @@ msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
-"هل أنت متأكد أنك تريد إزالة جميع الرسائل المحذوفة في جميع المجلدات نهائياً؟"
+"هل أنت متأكد أنك تريد إزالة جميع الرسائل المحذوفة في جميع المجلدات نهائيًا؟"
 
 #: ../mail/mail.error.xml.h:14
 #, fuzzy
@@ -14846,7 +15235,7 @@ msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr ""
-"هل أنت متأكد أنك تريد إزالة جميع الرسائل المحذوفة في جميع المجلدات نهائياً؟"
+"هل أنت متأكد أنك تريد إزالة جميع الرسائل المحذوفة في جميع المجلدات نهائيًا؟"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14975,7 +15364,7 @@ msgstr "غير قادر على تعيين البرنامج النصي للتوق
 #: ../mail/mail.error.xml.h:41
 #, fuzzy
 msgid "Check Junk Failed"
-msgstr "فحص بحثاً عن النفاية"
+msgstr "فحص بحثًا عن النفاية"
 
 #: ../mail/mail.error.xml.h:42
 msgid ""
@@ -15027,7 +15416,7 @@ msgstr "لا تعطل"
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
-msgstr "هل تريد أن تزامن محلياً المجلدات المؤشرة للاستخدام دون اتصال؟"
+msgstr "هل تريد أن تزامن محليًا المجلدات المؤشرة للاستخدام دون اتصال؟"
 
 #: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
@@ -15059,7 +15448,7 @@ msgstr "الملف موجود لكن الكتابة فوقه غير ممكنة."
 
 #: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
-msgstr "الملف موجود لكنه ليس ملفاً عادياً."
+msgstr "الملف موجود لكنه ليس ملفًا عاديًا."
 
 #: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
@@ -15105,7 +15494,7 @@ msgstr "توثق غير صالح"
 
 #: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
-msgstr "تم تحديث مرشحات البريد تلقائياً."
+msgstr "تم تحديث مرشحات البريد تلقائيًا."
 
 #: ../mail/mail.error.xml.h:72
 msgid ""
@@ -15116,7 +15505,7 @@ msgid ""
 msgstr ""
 "تضيف كثير من أنظمة البريد ترويسة Apparently-To إلى الرسائل التي يتم إرسالها "
 "إلى مستقبلي النسخة الكربونية المخفية فقط. إذا تمت إضافة هذه الترويسة، "
-"فستحتوي على قائمة بكل مستقبلي رسالتك. لتفادي هذا، يجب أن تضيف مستقبلاً واحداً "
+"فستحتوي على قائمة بكل مستقبلي رسالتك. لتفادي هذا، يجب أن تضيف مستقبلًا واحدًا "
 "على الأقل في خانة إلى: أو ن.ك:."
 
 #: ../mail/mail.error.xml.h:73
@@ -15133,7 +15522,7 @@ msgstr "لم يتم انتقاء مصدر."
 
 #: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
-msgstr "فتح عدد كبير من الرسائل دفعة واحدة قد يستغرق وقتاً كبيراً."
+msgstr "فتح عدد كبير من الرسائل دفعة واحدة قد يستغرق وقتًا كبيرًا."
 
 #: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
@@ -15162,7 +15551,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
-msgstr "رجاءً قدم اسماً فريداً لتعريف هذا التوقيع."
+msgstr "رجاءً قدم اسمًا فريدًا لتعريف هذا التوقيع."
 
 #: ../mail/mail.error.xml.h:84
 msgid "Please wait."
@@ -15188,7 +15577,7 @@ msgstr "تم طلب إخطار قراءة."
 #: ../mail/mail.error.xml.h:89
 #, fuzzy
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "هل تريد فعلاً حذف المجلد &quot;{0}&quot; وكل مجلداته الفرعية؟"
+msgstr "هل تريد فعلًا حذف المجلد &quot;{0}&quot; وكل مجلداته الفرعية؟"
 
 #: ../mail/mail.error.xml.h:90
 #, fuzzy
@@ -15201,7 +15590,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
-msgstr "تم تحديث مجلدات البحث تلقائياً."
+msgstr "تم تحديث مجلدات البحث تلقائيًا."
 
 #: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
@@ -15209,7 +15598,7 @@ msgstr "أرسِل إخطار الوصول"
 
 #: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
-msgstr "التوقيع موجود مسبقاً."
+msgstr "التوقيع موجود مسبقًا."
 
 #: ../mail/mail.error.xml.h:95
 msgid "Synchronize"
@@ -15217,7 +15606,7 @@ msgstr "زامن"
 
 #: ../mail/mail.error.xml.h:96
 msgid "Synchronize folders locally for offline usage?"
-msgstr "أتريد مزامنة المجلدات محلياً للاستخدام بدون اتصال؟"
+msgstr "أتريد مزامنة المجلدات محليًا للاستخدام بدون اتصال؟"
 
 #: ../mail/mail.error.xml.h:97
 msgid ""
@@ -15240,7 +15629,7 @@ msgstr ""
 "\n"
 "تضيف كثير من أنظمة البريد ترويسة Apparently-To إلى الرسائل التي يتم إرسالها "
 "إلى مستقبلي النسخة الكربونية المخفية فقط. إذا تمت إضافة هذه الترويسة، "
-"فستحتوي على قائمة بكل مستقبلي رسالتك. لتفادي هذا، يجب أن تضيف مستقبلاً واحداً "
+"فستحتوي على قائمة بكل مستقبلي رسالتك. لتفادي هذا، يجب أن تضيف مستقبلًا واحدًا "
 "على الأقل في خانة إلى: أو ن.ك:."
 
 #: ../mail/mail.error.xml.h:101
@@ -15275,21 +15664,21 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
-msgstr "يجب أن يكون ملف البرنامج النصي موجوداً وقابلاً للتنفيذ."
+msgstr "يجب أن يكون ملف البرنامج النصي موجودًا وقابلًا للتنفيذ."
 
 #: ../mail/mail.error.xml.h:112
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
-"يمكن أن يكون هذا المجلد قد تمت إضافته ضمنياً\n"
+"يمكن أن يكون هذا المجلد قد تمت إضافته ضمنيًا\n"
 "إن أردت، يمكنك الذهاب إلى محرر مجلدات البحث لإضافته صراحةً."
 
 #: ../mail/mail.error.xml.h:114
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
-msgstr "لا يمكن إرسال هذه الرسالة لأن الحساب الذي اخترت الإرسال به ليس مفعلاً"
+msgstr "لا يمكن إرسال هذه الرسالة لأن الحساب الذي اخترت الإرسال به ليس مفعلًا"
 
 #: ../mail/mail.error.xml.h:115
 msgid ""
@@ -15300,7 +15689,7 @@ msgstr "لا يمكن إرسال هذه الرسالة لأنك لم تحدد أ
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
-msgstr "هذا الخادوم لا يدعم هذا النوع من التوثق وقد لا يدعم التوثق أساساً."
+msgstr "هذا الخادوم لا يدعم هذا النوع من التوثق وقد لا يدعم التوثق أساسًا."
 
 #: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
@@ -15323,7 +15712,7 @@ msgid ""
 "folder instead?"
 msgstr ""
 "غير قادر على فتح مجلد المسودات لهذا الحساب. هل تريد استخدام مجلد مسودات "
-"النظام بدلاً منه؟"
+"النظام بدلًا منه؟"
 
 #: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
@@ -15353,7 +15742,7 @@ msgstr "لم تكتب جميع المعلومات المطلوبة."
 
 #: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "توجد لديك رسائل غير مرسلة، هل ترغب في الإنهاء أياً كان؟"
+msgstr "توجد لديك رسائل غير مرسلة، هل ترغب في الإنهاء أيًا كان؟"
 
 #: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
@@ -15373,7 +15762,7 @@ msgid ""
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
-"عليك تحديد مجلداً واحداً على الأقل كمصدر.\n"
+"عليك تحديد مجلدًا واحدًا على الأقل كمصدر.\n"
 "إما بانتقاء المجلدات بصورة فردية، و/أو بانتقاء كل المجلدات المحلية، أو كل "
 "المجلدات البعيدة، أو النوعين."
 
@@ -15402,85 +15791,86 @@ msgstr "_شطب"
 msgid "_Open Messages"
 msgstr "افت_ح الرسائل"
 
-#: ../mail/message-list.c:1050
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "غير مراجع"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "روجع"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "مجاب"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 #, fuzzy
 msgid "Forwarded"
 msgstr "مرر"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "رسائل غير مراجعة متعدّد"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "رسائل متعدّدة"
 
-#: ../mail/message-list.c:1059
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "الأدنى"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "أدنى"
 
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "أعلى"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "الأعلى"
 
-#: ../mail/message-list.c:1594 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "؟"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1601 ../plugins/itip-formatter/itip-view.c:204
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "اليوم %l:%M %p"
 
-#: ../mail/message-list.c:1610 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "الأمس %l:%M %p"
 
-#: ../mail/message-list.c:1622 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:3818
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3888 ../mail/message-list.c:4324
 msgid "Generating message list"
 msgstr "يجري إنشاء قائمة الرسائل"
 
-#: ../mail/message-list.c:4093
+#: ../mail/message-list.c:4179
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 
-#: ../mail/message-list.c:4095
+#: ../mail/message-list.c:4181
 #, fuzzy
 msgid "There are no messages in this folder."
 msgstr "أرسِل رد على رسالة في مجلّد عمومي"
@@ -15595,6 +15985,7 @@ msgid ""
 msgstr "قائمة الدلالات التي سيبحث عنها ملحق مُذَكِّر المرفقات في متن الرسالة."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "الكلمات الأساسية"
 
@@ -15608,14 +15999,14 @@ msgid ""
 "Looks for clues in a message for mention of attachments and warns if the "
 "attachment is missing"
 msgstr ""
-"ابحث عن الدلالات في رسالة للتنبه للمرفقات والتحذير إن كان المرفق مفقوداً"
+"ابحث عن الدلالات في رسالة للتنبه للمرفقات والتحذير إن كان المرفق مفقودًا"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
 msgstr ""
-"وجد إيفوليوشن بعض الكلمات الأساسية التي تقترح أن هذه الرسالة تحتوي مرفقاً، "
+"وجد إيفوليوشن بعض الكلمات الأساسية التي تقترح أن هذه الرسالة تحتوي مرفقًا، "
 "ولكنه لم يجد هذا المرفق."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
@@ -15641,7 +16032,7 @@ msgstr "ملحق المرفقات الصوتية"
 
 #: ../plugins/backup-restore/backup-restore.c:107
 msgid "Select name of the Evolution backup file"
-msgstr "انتق اسماً لملف أرشيف إيفُليوشن"
+msgstr "انتق اسمًا لملف أرشيف إيفُليوشن"
 
 #: ../plugins/backup-restore/backup-restore.c:136
 msgid "_Restart Evolution after backup"
@@ -15649,7 +16040,7 @@ msgstr "أ_عد تشغيل إيفُليوشن بعد النسخ الاحتياط
 
 #: ../plugins/backup-restore/backup-restore.c:159
 msgid "Select name of the Evolution backup file to restore"
-msgstr "انتق اسماً لملف أرشيف إيفُليوشن لاسترجاعه"
+msgstr "انتق اسمًا لملف أرشيف إيفُليوشن لاسترجاعه"
 
 #: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after restore"
@@ -15667,7 +16058,7 @@ msgid ""
 msgstr ""
 "يمكنك استرجاع إيفوليوشن من نسختك الاحتياطية. يمكن استرجاع كل البريد "
 "والتقويمات والمهمات والمذكرات والمراسَلين. \n"
-"إنه يسترجع أيضاً إعداداتك الشخصية ومرشحات البريد، إلخ."
+"إنه يسترجع أيضًا إعداداتك الشخصية ومرشحات البريد، إلخ."
 
 #: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restore Evolution from the backup file"
@@ -15679,90 +16070,116 @@ msgstr "انتق أرشيف إيفُليوشن لاسترجاعه:"
 
 #: ../plugins/backup-restore/backup-restore.c:274
 msgid "Choose a file to restore"
-msgstr "اختر ملفاً لاسترجاعه"
+msgstr "اختر ملفًا لاسترجاعه"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
-msgstr "انسخ دليل إيفُليوشن إحتياطياً"
+msgstr "انسخ دليل إيفُليوشن إحتياطيًا"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "استعد دليل إيفُليوشن"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "تحقق من نسخ إيفُليوشِن الاحتياطي"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "أعد تشغيل إيفُليوشن"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr "مع واجهة المستخدم الرسومية"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "يجري إطفاء إيفوليوشن"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "يجري النسخ الاحتياطي لحسابات وإعدادات إيفُليوشن"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "جارٍ النسخ الاحتياطي لبيانات إيفوليوشن (البريد، المراسَلون، التقويم، المهمات، "
 "المذكرات)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "اكتمل النسخ الاحتياطي"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "جارٍ إعادة تشغيل إيفُليوشن"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
-msgstr "انسخ بيانات إيفُليوشن الحالية احتياطياً"
+msgstr "انسخ بيانات إيفُليوشن الحالية احتياطيًا"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "جارٍ استخراج الملفات من النسخة الاحتياطية"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "جارٍ تحميل إعدادات إيفُليوشِن"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "جارٍ إزالة ملفات النسخ الاحتياطي المؤقتة"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "جارٍ النسخ الاحتياطي إلى المجلد %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "يجري الاسترجاع من المجلد %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "نسخ إيفُليوشِن الاحتياطي"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "استرجاع إيفُليوشِن"
 
+#: ../plugins/backup-restore/backup.c:494
+#, fuzzy
+msgid "Backing up Evolution Data"
+msgstr "انسخ بيانات إيفُليوشن الحالية احتياطيًا"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:497
+#, fuzzy
+msgid "Restoring Evolution Data"
+msgstr "جارٍ إعادة تشغيل إيفُليوشن"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:516
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "ملحق لنسخ إعدادات وبيانات إيفُليوشن احتياطياً واستعادتها."
+msgstr "ملحق لنسخ إعدادات وبيانات إيفُليوشن احتياطيًا واستعادتها."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
@@ -15785,9 +16202,9 @@ msgid ""
 "you want Evolution to restart automatically after backup, please enable the "
 "toggle button."
 msgstr ""
-"نسخ إبفوليوشن الاحتياطي يمكن أن يبدأ فقط عندما لا يكون إيفوليوشن مشغلاً. رجاءً "
+"نسخ إبفوليوشن الاحتياطي يمكن أن يبدأ فقط عندما لا يكون إيفوليوشن مشغلًا. رجاءً "
 "تأكد أنك حفظت وأغلقت كل النوافذ غير المحفوظة قبل المتابعة. إن كنت تريد من "
-"إيفوليوشن أن يبدأ تلقائياً بعد النسخ الاحتياطي، رجاءً فعّل مفتاح التبديل."
+"إيفوليوشن أن يبدأ تلقائيًا بعد النسخ الاحتياطي، رجاءً فعّل مفتاح التبديل."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 #, fuzzy
@@ -15804,8 +16221,8 @@ msgstr "رجاءً انتق ملف نسخ احتياطي صالح في إيفُ�
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 #, fuzzy
-msgid "The selected folder does not have enough permissions to create the file"
-msgstr "ليست لديك تصاريح كافية لحذف هذا البريد."
+msgid "The selected folder is not writable."
+msgstr "نسخ المجلد المُنتقى إلى داخل مجلد آخر"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
@@ -15817,8 +16234,8 @@ msgid ""
 msgstr ""
 "هذا سوف يحذف كل بيانات إيفوليوشن الحالية والإعدادات ويسترجعها من نسختك "
 "الاحتياطية. استرجاع إبفوليوشن يمكن أن يبدأ فقط عندما لا يكون إيفوليوشن "
-"مشغلاً. رجاءً تأكد أنك حفظت وأغلقت كل النوافذ غير المحفوظة قبل المتابعة. إن "
-"كنت تريد من إيفوليوشن أن يبدأ تلقائياً بعد الاسترجاع، رجاءً فعّل مفتاح التبديل."
+"مشغلًا. رجاءً تأكد أنك حفظت وأغلقت كل النوافذ غير المحفوظة قبل المتابعة. إن "
+"كنت تريد من إيفوليوشن أن يبدأ تلقائيًا بعد الاسترجاع، رجاءً فعّل مفتاح التبديل."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
@@ -15839,9 +16256,9 @@ msgstr "المراسَلون التلقائيون"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
-msgstr "أنشيء تل_قائياً مداخل في دفتر العناوين عند الرد على الرسائل"
+#, fuzzy
+msgid "_Auto-create addressbook entries when replying to messages"
+msgstr "أنشئ تل_قائيًا مداخل في دفتر العناوين عند الرد على الرسائل"
 
 #: ../plugins/bbdb/bbdb.c:571
 msgid "Select Address book for Automatic Contacts"
@@ -15853,10 +16270,9 @@ msgstr "مراسَلو المراسلة الفورية"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
-msgstr "زامِن معلومات المراسَلين وصورهم دورياً مع قائمة أصدقاء Pidgin"
+#, fuzzy
+msgid "Synchronize contact info and images from Pidgin buddy list"
+msgstr "زامِن معلومات المراسَلين وصورهم دوريًا مع قائمة أصدقاء Pidgin"
 
 #: ../plugins/bbdb/bbdb.c:607
 msgid "Select Address book for Pidgin buddy list"
@@ -15874,7 +16290,7 @@ msgid ""
 "lists."
 msgstr ""
 "لملء دفتر عناوينك بالأسماء وعناوين البريد الإلكتروني عند ردك على الرسائل. "
-"ولملئه أيضاً بمعلومات الاتصال عن طريق المراسلة الفورية بمن هم في قائمة "
+"ولملئه أيضًا بمعلومات الاتصال عن طريق المراسلة الفورية بمن هم في قائمة "
 "أصدقائك."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
@@ -15941,7 +16357,7 @@ msgid "_URL:"
 msgstr "ع_نوان:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:352
+#: ../plugins/google-account-setup/google-source.c:357
 msgid "Use _SSL"
 msgstr "استخدم _SSL"
 
@@ -15963,7 +16379,7 @@ msgstr "يوفر الوظائف الأساسية للتقويمات المحلي
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:376
+#: ../plugins/google-account-setup/google-source.c:381
 #, fuzzy
 msgid "Re_fresh:"
 msgstr "أعِد الت_حميل"
@@ -15995,7 +16411,7 @@ msgstr "حالة الطقس: ضباب"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Partly Cloudy"
-msgstr "حالة الطقس: غائم جزئياً"
+msgstr "حالة الطقس: غائم جزئيًا"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Rain"
@@ -16015,7 +16431,7 @@ msgstr "حالة الطقس: عواصف رعدية"
 
 #: ../plugins/calendar-weather/calendar-weather.c:267
 msgid "Select a location"
-msgstr "انتق موقعاً"
+msgstr "انتق موقعًا"
 
 #: ../plugins/calendar-weather/calendar-weather.c:652
 msgid "_Units:"
@@ -16042,7 +16458,7 @@ msgid ""
 "A test plugin which demonstrates a popup menu plugin which lets you copy "
 "things to the clipboard."
 msgstr ""
-"ملحق اختباري يظهر مثالاً لملحق يعرض قائمة منبثقة تسمح لك بنسخ أشياء للحافظة."
+"ملحق اختباري يظهر مثالًا لملحق يعرض قائمة منبثقة تسمح لك بنسخ أشياء للحافظة."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
@@ -16055,7 +16471,7 @@ msgstr "إفحص ما إذا كان إيفُليوشن هو مرسل البري�
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "تأكد دائماً من أن إيفُليوشن هو عميل البريد الافتراضي عند فتحه."
+msgstr "تأكد دائمًا من أن إيفُليوشن هو عميل البريد الافتراضي عند فتحه."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
@@ -16067,7 +16483,7 @@ msgstr "عميل البريد الافتراضي"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "هل تريد جعل إيفُليوشن عميلاً افتراضياً لبريدك؟"
+msgstr "هل تريد جعل إيفُليوشن عميلًا افتراضيًا لبريدك؟"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
 #: ../shell/main.c:679
@@ -16106,11 +16522,28 @@ msgstr ""
 "يوفر امكانية وضع علامة لتقويم أو دفتر عناوين لجعله التقويم أو دفتر العناوين "
 "الافتراضي."
 
-#: ../plugins/email-custom-header/email-custom-header.c:535
+#: ../plugins/email-custom-header/email-custom-header.c:562
 #, fuzzy
 msgid "_Custom Header"
 msgstr "ترويسات مخصصة"
 
+#: ../plugins/email-custom-header/email-custom-header.c:883
+#, fuzzy
+msgid "Key"
+msgstr "كينيا"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr ""
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
 #, fuzzy
 msgid "Email Custom Header"
@@ -16128,7 +16561,7 @@ msgstr "ترويسات مخصصة"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
 #, fuzzy
-msgid "List of Custom Header"
+msgid "List of Custom Headers"
 msgstr "ترويسات مخصصة"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
@@ -16188,8 +16621,8 @@ msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
 msgstr ""
-"الرسالة المحددة أدناه سيتم إرسالها تلقائياً إلى \n"
-"كل شخص يرسل لك بريداً وأنت خارج المكتب."
+"الرسالة المحددة أدناه سيتم إرسالها تلقائيًا إلى \n"
+"كل شخص يرسل لك بريدًا وأنت خارج المكتب."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:274
 #: ../plugins/exchange-operations/exchange-account-setup.c:279
@@ -16239,29 +16672,34 @@ msgstr "حجم المحلدات"
 msgid "Exchange Settings"
 msgstr "إعدادات إكستشينج"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:623
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "عنوان _وصول آتولوك من ويب:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:649
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "و_ثِّق"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:852
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#, fuzzy
+msgid "_Mailbox:"
+msgstr "_بريد"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "نوع التوثق"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:866
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "فح_ص الأنواع المدعومة"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:978
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s ك.بايت"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -16351,7 +16789,7 @@ msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
 msgstr ""
-"هذه الرسالة أُرسلت تلقائياً من قبل إيفوليوشن لإعلامك أنك الآن مندوب عني. يمكنك "
+"هذه الرسالة أُرسلت تلقائيًا من قبل إيفوليوشن لإعلامك أنك الآن مندوب عني. يمكنك "
 "الآن إرسال الرسائل باسمي."
 
 #. To translators: Another chunk of the same message.
@@ -16365,14 +16803,14 @@ msgstr "لقد أُعطيتَ الأذونات التالية على مجلدا�
 #.
 #: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
-msgstr "يُسمح لك أيضاً برؤية عناصري الخاصة."
+msgstr "يُسمح لك أيضًا برؤية عناصري الخاصة."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
 #: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
-msgstr "على أي حال، ليس مسموحاً لك برؤية عناصري الخاصة."
+msgstr "على أي حال، ليس مسموحًا لك برؤية عناصري الخاصة."
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
@@ -16482,7 +16920,7 @@ msgstr "حجم المجلّد"
 msgid "User"
 msgstr "_مستخدم"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "الاشتراك في مجلد مستخدم آخر"
@@ -16501,7 +16939,7 @@ msgstr "ألغاء الإشتراك في المجلّد..."
 #: ../plugins/exchange-operations/exchange-folder.c:519
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "هل تريد فعلاً إلغاء الاشتراك في المجلد \"%s\"؟"
+msgstr "هل تريد فعلًا إلغاء الاشتراك في المجلد \"%s\"؟"
 
 #: ../plugins/exchange-operations/exchange-folder.c:476
 #: ../plugins/exchange-operations/exchange-folder.c:531
@@ -16515,7 +16953,7 @@ msgid ""
 "\n"
 "Would you like to change your status to \"In the Office\"? "
 msgstr ""
-"<b>حاليّاً، حالتك هي \"خارج المكتب\". </b>\n"
+"<b>حاليًّا، حالتك هي \"خارج المكتب\". </b>\n"
 "\n"
 "أتريد تغييرها إلى \"في المكتب\"؟ "
 
@@ -16533,16 +16971,16 @@ msgid ""
 "who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
-"<small>الرّسالة المحدّدة أدناه سترسل تلقائيّاً لكل شخص يرسل\n"
-"لك بريداً حين تكون خارج المكتب.</small>"
+"<small>الرّسالة المحدّدة أدناه سترسل تلقائيًّا لكل شخص يرسل\n"
+"لك بريدًا حين تكون خارج المكتب.</small>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:8
 msgid "I am currently in the office"
-msgstr "أنا في المكتب حاليّاً"
+msgstr "أنا في المكتب حاليًّا"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:9
 msgid "I am currently out of the office"
-msgstr "أنا خارج المكتب حاليّاً"
+msgstr "أنا خارج المكتب حاليًّا"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:10
 msgid "No, Don't Change Status"
@@ -16679,11 +17117,11 @@ msgstr ""
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:12
 msgid "Request a _delivery receipt for this message"
-msgstr "أطلب إخطاراً بالوصول لهذه الرسالة"
+msgstr "أطلب إخطارًا بالوصول لهذه الرسالة"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:13
 msgid "Request a _read receipt for this message"
-msgstr "أطلب إخطاراً بالقراءة لهذه الرسالة"
+msgstr "أطلب إخطارًا بالقراءة لهذه الرسالة"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:14
 msgid "Send as Delegate"
@@ -16787,7 +17225,7 @@ msgstr "غير قادر على تحديد موقع الخادوم {0}."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not make {0} a delegate"
-msgstr "غير قادر على تعيين {0} مُفَوَّضاً"
+msgstr "غير قادر على تعيين {0} مُفَوَّضًا"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions"
@@ -16810,10 +17248,14 @@ msgid "Could not update out-of-office state"
 msgstr "غير قادر على تحديث حالة خارج المكتب"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "حساب إكستشينج غير متصل."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16830,7 +17272,7 @@ msgid ""
 msgstr ""
 "متصل إكستشينج يتطلب الوصول لبعض\n"
 "وظائف خادوم إكستشينج التي يبدو أنها\n"
-"معطلة أو ممنوعة. (يحدث هذا غالباً\n"
+"معطلة أو ممنوعة. (يحدث هذا غالبًا\n"
 "دون قصد.) يجب على مدير إكستشينج \n"
 "تفعيل هذه الوظائف حتى تستطيع \n"
 "استخدام متصل إكستشينج الخاص بإيفُليوشن.\n"
@@ -16841,32 +17283,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "فشل تحديث المُفَوَّضِين:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
-msgstr "المجلّد موجود مسبقاً"
+msgstr "المجلّد موجود مسبقًا"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
-msgstr "المجلّد ليس موجوداً"
+msgstr "المجلّد ليس موجودًا"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "المجلّد غير متصل"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 #: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "خطأ عام"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "لا يمكن الوصول لخادوم المسرد العالمي"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -16874,71 +17316,71 @@ msgstr ""
 "إن كان برنامج وصول آوتلوك من ويب يعمل على مسار مختلف، يجب أن تحدد هذا المسار "
 "في مربع حوار تكوين الحساب."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
-msgstr "صندوق البريد لـ{0} ليس موجوداً على هذا الخادوم."
+msgstr "صندوق البريد لـ{0} ليس موجودًا على هذا الخادوم."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "تأكد من صحة العنوان وحاول مرة أخرى."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "تأكد من صحة كتابة اسم الخادوم وحاول مرة أخرى."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr "تأكد من صحة اسم المستخدم وكلمة السر وحاول مرة أخرى."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "لم يتم تعيين خادوم مسرد عالمي لهذا الحساب."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "لا يوجد صندوق بريد للمستخدم {0} على {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "لا يوجد مستخدم بالاسم {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "تم تغيير كلمة السر بنجاح."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr "رجاءً أدخل معرّف المندوب أو أزل التأشير عن خيار الإرسال كمندوب."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "رجاءً تأكد من أن اسم خادوم المسرد العالمي مكتوب بصورة صحيحة."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "رجاء أعد تشغيل إيفُليوشن لكي يظهر أثر التغييرات"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "الرجاء انتقاء مستخدم."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
-msgstr "رفض الخادوم كلمة السر لأنها ضعيفة جداً."
+msgstr "رفض الخادوم كلمة السر لأنها ضعيفة جدًا."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "سيتم تعطيل حساب إكستشينج عندما تنهي إيفُليوشن"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "ستتم إزالة حساب إكستشينج عندما تنهي إيفُليوشن"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "خادوم إكستشينج غير متوافق مع متصل إكستشينج."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -16946,7 +17388,7 @@ msgstr ""
 "الخادوم يقوم بتشغيل إكستشينج ٥.٥. متصل إكستشينج لا يدعم سوى مايكروسوفت "
 "إكستشينج ٢٠٠٠ و ٢٠٠٣ فقط."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -16954,78 +17396,78 @@ msgid ""
 "\n"
 "Or you might have just typed your password wrong."
 msgstr ""
-"يعني هذا غالباً أن خادومك يتطلب \n"
+"يعني هذا غالبًا أن خادومك يتطلب \n"
 "تحديد اسم نطاق ويندوز \n"
 "كجزء من اسم المستخدم (مثل: &quot;نطاق\\مستخدم&quot;).\n"
 "\n"
 "أو من الممكن أن تكون قد أخطأت في كتابة كلمة السر."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "حاول مرة أخرى بكلمة سر مختلفة."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "غير قادر على إضافة المستخدم لقائمة التحكم بالنفاذ:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "غير قادر على تحرير المُفَوَّضِين."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "حدث خطأ أثناء محاولة العثور على {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error."
 msgstr "خطأ مجهول."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "نوع مجهول"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "عمليّة غير مدعومة"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "لقد قاربت على استخدام كل المساحة المخصصة لتخزين البريد على هذا الخادوم."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr "يُسمح لك بإرسال رسالة باسم منتدب واحد في نفس الوقت."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "لا يمكنك انتداب نفسك"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "لقد تخطيت المساحة المخصصة لك لتخزين البريد على هذا الخادوم."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "لا يمكن لك إلا أن تشكل حساب إكيتشينج واحد فقط."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr ""
-"استخدامك الحالي هو: {0} كب. حاول إفراغ جزءاً من المساحة عن طريق حذف بعض "
+"استخدامك الحالي هو: {0} كب. حاول إفراغ جزءًا من المساحة عن طريق حذف بعض "
 "البريد."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr "استخدامك الحالي هو: {0} كب. لن تستطيع إرسال أو تلقي البريد الآن."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17033,21 +17475,21 @@ msgstr ""
 "استخدامك الحالي هو: {0} كب. لن تستطيع إرسال أو تلقي البريد حتى تفرغ بعض "
 "المساحة عن طريق حذف بعض البريد."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "نفدت صلاحية كلمة سرك."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} لا يمكن إضافته إلى قائمة تحكم بالنفاذ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
-msgstr "{0} مندوب مسبقاً"
+msgstr "{0} مندوب مسبقًا"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
-msgstr "{0} موجود في القائمة مسبقاً"
+msgstr "{0} موجود في القائمة مسبقًا"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
 msgid "Subscribe to Other User's Tasks"
@@ -17099,7 +17541,8 @@ msgid ""
 msgstr ""
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
+#, fuzzy
+msgid "Compose in _External Editor"
 msgstr "اكتبْ في محرر خارجي"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
@@ -17136,7 +17579,7 @@ msgid ""
 msgstr ""
 "أرفق ترويسة صورة الوجه مع البريد الصادر. يحتاج المستخدم في المرة الأولى إلى "
 "إعداد صورة png 48*48. ستـُرمّز بترميز base64 وتـُخزّن في ~/.evolution/faces . "
-"سيُستخدم ذلك في رسائل البريد التي ستـُرسل من الآن وصاعداً."
+"سيُستخدم ذلك في رسائل البريد التي ستـُرسل من الآن وصاعدًا."
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
@@ -17160,13 +17603,35 @@ msgstr "ألغاء الإشتراك في المجلّدات"
 msgid "_Unsubscribe"
 msgstr "إل_غاء الإشتراك"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:73
+#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "جوجل"
 
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+#, fuzzy
+msgid "<b>Server</b>"
+msgstr "<b>أعضاء</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+#, fuzzy
+msgid "Username:"
+msgstr "ا_سم المستخدم:"
+
+#. Translators: This is the first half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
+#: ../plugins/google-account-setup/google-contacts-source.c:233
+#, fuzzy
+msgid "Update every"
+msgstr "تحديث الإستفسار"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
+#, fuzzy
+msgid "A plugin to setup google calendar and contacts."
 msgstr "ملحق لإعداد تقويم جوجل."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17253,10 +17718,21 @@ msgid "_Junk List"
 msgstr "قائمة ال_نفايات"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+#, fuzzy
+msgid "Message Retract"
+msgstr "حالة الرسالة"
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr "تم سحب الرسالة بنجاح"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "سحب بريد"
 
@@ -17264,12 +17740,6 @@ msgstr "سحب بريد"
 msgid "Add Send Options to groupwise messages"
 msgstr "أضِف خيارات الإرسال لرسائل جروبوايز"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "خيارات الإرسال"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "ملحق لمزايا حسابات جروبوايز."
@@ -17318,35 +17788,41 @@ msgstr ""
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
 #, fuzzy
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "يوجد مجلد بالاسم &quot;{1}&quot; مسبقاً. رجاء حدد اسماً مختلفاً."
+msgstr "يوجد مجلد بالاسم &quot;{1}&quot; مسبقًا. رجاء حدد اسمًا مختلفًا."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
 #, fuzzy
 msgid "Account Already Exists"
-msgstr "التوقيع موجود مسبقاً."
+msgstr "التوقيع موجود مسبقًا."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
-msgstr ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr "يوجد مجلد بالاسم &quot;{1}&quot; مسبقًا. رجاء حدد اسمًا مختلفًا."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 #, fuzzy
 msgid "This is a recurring meeting"
-msgstr "إجعل هذا حدثاً متكرراً"
+msgstr "إجعل هذا حدثًا متكررًا"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
 #, fuzzy
-msgid "What would you like to {0}?"
+msgid "Would you like to accept it?"
 msgstr "أترغب في حفظ تغييراتك؟"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 #, fuzzy
+msgid "Would you like to decline it?"
+msgstr "أترغب في حفظ تغييراتك؟"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#, fuzzy
 msgid "You cannot share folder with specified user &quot;{0}&quot;"
 msgstr "لم أستطع الحفظ إلى ملف الحفظ الآلي &quot;{0}&quot;."
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "You have to specify a user name whom you want to add to the list"
 msgstr ""
 
@@ -17465,11 +17941,11 @@ msgstr "ولوج بالو_كالة..."
 
 #: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
-msgstr "لا يتوفر تبويب الوكيل إلا عندما يكون الحساب متصلاً."
+msgstr "لا يتوفر تبويب الوكيل إلا عندما يكون الحساب متصلًا."
 
 #: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr "لا يتوفر تبويب الوكيل إلا عندما يكون الحساب مفعلاً."
+msgstr "لا يتوفر تبويب الوكيل إلا عندما يكون الحساب مفعلًا."
 
 #: ../plugins/groupwise-features/share-folder-common.c:319
 #: ../plugins/groupwise-features/share-folder.c:750
@@ -17663,7 +18139,7 @@ msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
 msgstr ""
-"خدمة \"hald\" مطلوبة ولكنها غير مشغلة حالياً. رجاءً فعّل هذه الخدمة وأعد تشغيل "
+"خدمة \"hald\" مطلوبة ولكنها غير مشغلة حاليًا. رجاءً فعّل هذه الخدمة وأعد تشغيل "
 "هذا البرنامج، أو اتصل بمدير نظامك."
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:68
@@ -17820,7 +18296,7 @@ msgstr "التقويم المرفق غير صالح"
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
-msgstr "تدعي الرسالة أنها تحتوي تقويماً، لكن التقويم ليس بهيئة iCalendar صالحة."
+msgstr "تدعي الرسالة أنها تحتوي تقويمًا، لكن التقويم ليس بهيئة iCalendar صالحة."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1418
 #: ../plugins/itip-formatter/itip-formatter.c:1436
@@ -17848,31 +18324,31 @@ msgid ""
 "imported"
 msgstr "لمعالجة كل هذه العناصر، يجب حفظ الملف واستيراد التقويم."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2147
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "هذا الموعد متكرّر"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2150
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "هذه المهمة متكرّرة"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2153
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "هذه المذكرة متكرّرة"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2382
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "احذف الرسالة بعد الت_عامل معها"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2392
-#: ../plugins/itip-formatter/itip-formatter.c:2424
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "بحث عن تضارب"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2407
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "انتق تقويمات للبحث في عن تضاربات المواعيد"
 
@@ -18298,42 +18774,42 @@ msgid "_Update"
 msgstr "_تحديث"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1010
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "زمن ال_بدء:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "زمن الإ_نتهاء:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1035
-#: ../plugins/itip-formatter/itip-view.c:1085
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "تعليق:"
 
-#: ../plugins/itip-formatter/itip-view.c:1071
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "Send _reply to sender"
 msgstr "رُ_دّ على المرسِل"
 
-#: ../plugins/itip-formatter/itip-view.c:1099
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Send _updates to attendees"
 msgstr "أرسِل تحدي_ثات للحضور"
 
-#: ../plugins/itip-formatter/itip-view.c:1108
+#: ../plugins/itip-formatter/itip-view.c:1110
 msgid "_Apply to all instances"
 msgstr "_طبق على كل الحالات"
 
-#: ../plugins/itip-formatter/itip-view.c:1117
+#: ../plugins/itip-formatter/itip-view.c:1119
 msgid "Show time as _free"
 msgstr "أظهر الوقت كمُتفرِّغ"
 
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "ال_مهام :"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "تذكيرات :"
 
@@ -18395,8 +18871,10 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "توليد رسالة D-BUS عند وصول رسائل بريد جديدة."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#, fuzzy
 msgid ""
-"If true, then beep, otherwise will play sound file when new messages arrive."
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr "إن كان صحيحا، فصَفِّرْ وإلاَّ فشغل ملف صوت عند وصول رسائل جديدة."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
@@ -18439,12 +18917,22 @@ msgstr "ما إن كان على الأيقونة أن تومِض أم لا."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "فيما يجب التبليغ عن الرسائل الجديدة في مجلد الداخل فقط."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "توليد _رسالة D-BUS"
 
+#: ../plugins/mail-notification/mail-notification.c:378
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "تنبيه بريدي"
+
+#: ../plugins/mail-notification/mail-notification.c:399
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "تنبيه بريدي"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18457,7 +18945,7 @@ msgstr[1] "لقد استلمت رسالتان (%d) في %s."
 msgstr[2] "لقد استلمت (%d) رسائل في %s."
 msgstr[3] "لقد استلمت (%d) رسالة  في %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:463
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18466,48 +18954,48 @@ msgstr[1] "لقد استلمت رسالتان جديدتان (%Id)."
 msgstr[2] "لقد استلمت %Id رسائل جديدة."
 msgstr[3] "لقد استلمت %Id رسالة جديدة."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
 msgid "New email"
 msgstr "بريد جديد"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:542
 msgid "Show icon in _notification area"
 msgstr "اظهر الأيقونة في م_ساحة التبليغ"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:545
 msgid "B_link icon in notification area"
 msgstr "وم_يض الأيقونة في منطقة التبليغ"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:547
 msgid "Popup _message together with the icon"
 msgstr "اجعل ال_رسالة تنبثق مع الأيقونة"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:728
 msgid "_Play sound when new messages arrive"
 msgstr "إعزف الصوت عند وصول رسائل جديدة"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "_Beep"
 msgstr "_صافرة"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:735
 msgid "Play _sound file"
 msgstr "شَغِّل ملف صوت"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Specify _filename:"
 msgstr "تحديد اسم _ملف:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Select sound file"
 msgstr "انتقاء ملف صوت"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Pl_ay"
 msgstr "اق_ر ء"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:805
 msgid "Notify new messages for _Inbox only"
 msgstr "بَلِّغ عن الرسائل الجديدة للبريد الوافد فقط"
 
@@ -18621,7 +19109,7 @@ msgid ""
 "has been sent."
 msgstr ""
 "سيتم إرسال رسالة بريد إلكتروني للعنوان \"{0}\". يمكنك إما أن ترسل الرسالة "
-"آلياً، أو أن تراها وتغيرها أولاً.\n"
+"آليًا، أو أن تراها وتغيرها أولًا.\n"
 "\n"
 "ستستقبل إجابة من القائمة البريدية بعد إرسال الرسالة بفترة قصيرة."
 
@@ -18779,7 +19267,7 @@ msgstr "وضع علامة التقويم المنتقى لعرضه في وضع �
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
 msgid "_Do not make available for offline use"
-msgstr "_لا تجعل هذا التقويم متوفراً للاستخدام دون اتصال"
+msgstr "_لا تجعل هذا التقويم متوفرًا للاستخدام دون اتصال"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
 msgid "_Make available for offline use"
@@ -18799,7 +19287,7 @@ msgstr "ملحق لإدارة ما إذا كانت الملحقات مفعلة �
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:210
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "مدير الملحقات"
 
@@ -18815,29 +19303,20 @@ msgstr "ملح_قات"
 msgid "Author(s)"
 msgstr "المؤلف(ون)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:43
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "الوصف"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "إعدادات "
 
-#: ../plugins/plugin-manager/plugin-manager.c:223
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "ملحوظة: بعض التغييرات لن تأخذ مجراها إلا بعد إعادة التشغيل"
 
-#: ../plugins/plugin-manager/plugin-manager.c:245
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
 msgstr "نظرة عامة "
 
-#: ../plugins/plugin-manager/plugin-manager.c:246
-msgid "Configuration"
-msgstr "إعدادات "
-
-#: ../plugins/plugin-manager/plugin-manager.c:262
-msgid "There is no configuration option for this plugin."
-msgstr "لا يوجد خيار تشكيل لهذا الملحق."
-
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/plugin-manager/plugin-manager.c:385
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "ملحق"
 
@@ -18848,7 +19327,7 @@ msgid ""
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
-"ملحق اختباري يعرض مثالاً لملحق للتهيئة يسمح لك بتعطيل رسائل HTML.\n"
+"ملحق اختباري يعرض مثالًا لملحق للتهيئة يسمح لك بتعطيل رسائل HTML.\n"
 "\n"
 "هذا الملحق ليس سوى مثال وهو غير مدعوم.\n"
 
@@ -18863,7 +19342,7 @@ msgstr "افضل نصا عاديا"
 
 #: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
-msgstr "اظهر HTML إن كان موجوداً"
+msgstr "اظهر HTML إن كان موجودًا"
 
 #: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
@@ -18883,7 +19362,7 @@ msgstr "مخصص إيفُليوشن"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
 msgid "Writes a log of profiling data events."
-msgstr "يكتب سجلاً بأحداث تخصيص البيانات."
+msgstr "يكتب سجلًا بأحداث تخصيص البيانات."
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
@@ -18919,9 +19398,9 @@ msgid ""
 "Weekly\n"
 "Manual (via Actions menu)"
 msgstr ""
-"يومياً\n"
-"أسبوعياً\n"
-"يدوياً (عبر قائمة إجراءات)"
+"يوميًا\n"
+"أسبوعيًا\n"
+"يدويًا (عبر قائمة إجراءات)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
@@ -18989,6 +19468,32 @@ msgstr ""
 "iCal\n"
 "متوفر/مشغول"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+#, fuzzy
+msgid "Hello Python"
+msgstr "هاتف المنزل"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+#, fuzzy
+msgid "Python Loader"
+msgstr "محمل مونو"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "قاتل البريد المزعج (مضمّن)"
@@ -19046,7 +19551,7 @@ msgid ""
 "to be installed."
 msgstr ""
 "لترشيح البريد المهمل باستخدام قاتل البريد المزعج. هذا الملحق يتطلب وجود قاتل "
-"البريد المزعج مثبتاً."
+"البريد المزعج مثبتًا."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "SpamAssassin junk plugin"
@@ -19083,7 +19588,6 @@ msgid "MIME Type"
 msgstr "نوع MIME"
 
 #: ../plugins/save-attachments/save-attachments.c:347
-#: ../ui/evolution-editor.xml.h:12
 msgid "Save"
 msgstr "احفظ"
 
@@ -19198,7 +19702,7 @@ msgstr "انتق ملفّ الوجهة"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
 msgid "Select one source"
-msgstr "انتق مصدراً واحداً"
+msgstr "انتق مصدرًا واحدًا"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
 msgid "Selects a single calendar or task source for viewing."
@@ -19217,13 +19721,13 @@ msgid "Show _only this Task List"
 msgstr "لا تعرض _سوى قائمة المهام هذه"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-#, fuzzy
-msgid "A plugin that manages the Startup wizard."
-msgstr "ملحق يدير مساعد بدء التشغيل."
+msgid "Guides you through your initial account setup."
+msgstr ""
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "مساعد بدء التشغيل"
+#, fuzzy
+msgid "Setup Assistant"
+msgstr "المساعد"
 
 #: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
@@ -19240,7 +19744,7 @@ msgid ""
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"مرحباً بك في إيفُليوشن. ستسمح لك الشاشات التالية بالاتصال بحسابات بريدك، "
+"مرحبًا بك في إيفُليوشن. ستسمح لك الشاشات التالية بالاتصال بحسابات بريدك، "
 "واستيراد ملفات من تطبيقات أخرى. \n"
 "\n"
 "رجاءً اضغط زر \"أمام\" للمتابعة. "
@@ -19288,6 +19792,32 @@ msgstr "رسائل المناقشات حسب الموضوع"
 msgid "F_all back to threading messages by subject"
 msgstr "التراجع إلى رسائل المناقشة حسب المو_ضوع"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+#, fuzzy
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr "قائمة الدلالات التي سيبحث عنها ملحق مُذَكِّر المرفقات في متن الرسالة."
+
+#: ../plugins/templates/templates.c:614
+#, fuzzy
+msgid "No title"
+msgstr "المسمّى الوظيفي"
+
+#: ../plugins/templates/templates.c:743
+#, fuzzy
+msgid "Save as _Template"
+msgstr "احفظ _كمسودة"
+
+#: ../plugins/templates/templates.c:745
+#, fuzzy
+msgid "Save as Template"
+msgstr "احفظ _كمسودة"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr ""
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "ملحق بسيط يستخدم ytnef لفك ترميز مرفقات tnef."
@@ -19296,6 +19826,31 @@ msgstr "ملحق بسيط يستخدم ytnef لفك ترميز مرفقات tnef
 msgid "TNEF Attachment decoder"
 msgstr "فاكّ ترميز مرفقات TNEF"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin to setup WebDAV contacts."
+msgstr "ملحق لإعداد تقويم جوجل."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+#, fuzzy
+msgid "WebDAV contacts"
+msgstr "لا مراسَلين"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+msgid "WebDAV"
+msgstr ""
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+#, fuzzy
+msgid "URL:"
+msgstr "ع_نوان:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgstr ""
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "قشرة إفُليوشِن"
@@ -19313,116 +19868,113 @@ msgid "Evolution Test component"
 msgstr "مكوّن إختبار إيفُليوشِن"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "وصف مَقطعي لإعدادات الطابعة الحالية."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Authenticate proxy server connections"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 #, fuzzy
 msgid "Automatic proxy configuration URL"
 msgstr "تعرّف آلي على الإبتسامات"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "إصدار التشكيل"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Decides whether the crash detection should be run or not."
 msgstr "يقرر ما إن كان يجب تشغيل اكتشاف الانهيار أم لا."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "العرض الافتراضي للشريط الجانبي"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "إرتفاع النّافذة الإفتراضي"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "الحالة الافتراضية للنافذة"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "عرض النّافذة الإفتراضي"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 #, fuzzy
 msgid "HTTP proxy password"
 msgstr "أدخل كلمة سِر"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy username"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "الهوية "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and locally stored password in .gnome2_private/."
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
 msgstr "آخر إصدار تشكيل تمت الترقية إليه"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "قائمة مسارات المجلدات المخطط تزامنها للقرص من أجل الاستخدام في وضع عدم "
 "الاتصال"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Non-proxy hosts"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 #, fuzzy
 msgid "Proxy configuration mode"
 msgstr "إعدادات "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "SOCKS proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Secure HTTP proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19430,27 +19982,27 @@ msgid ""
 "\" respectively."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "الشريط الجانبي مرئي"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "تخطّي مربع حوار التحذير من استخدام إصدار التطوير"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
 msgstr "تخطّي مربع حوار التحذير عند الاسترجاع"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
 msgid "Start in offline mode"
 msgstr "بدأ دون اتصال بالإنترنت"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "شريط الحالة مرئي"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19458,19 +20010,19 @@ msgstr ""
 "إصدار تشكيل إيفُليوشن، مع مستوى التشكيل الأكبر/الأصغر (\"2.6.0\" على سبيل "
 "المثال)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default height for the main window, in pixels."
 msgstr "الارتفاع الافتراضي للنافذة الرئيسية، بالبيكسل."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "The default width for the main window, in pixels."
 msgstr "العرض الافتراضي للنافذة الرئيسية، بالبيكسل."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "العرض الافتراضي للشريط الجانبي، بالبيكسل."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19478,37 +20030,37 @@ msgstr ""
 "آخر إصدار تشكيل تمت الترقية إليه،  مع مستوى التشكيل الأكبر/الأصغر (\"2.6.0\" "
 "على سبيل المثال)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid "The machine name to proxy secure HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy socks through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19518,7 +20070,7 @@ msgstr ""
 "\"مثل نوتيلس\". إن تم انتقاء \"مثل نوتيلس\" سيتم تحديد أسلوب عرض الأزرار حسب "
 "طريقة عرضها في جنوم."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -19526,66 +20078,66 @@ msgid ""
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "شريط الأدوات مرئي"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 #, fuzzy
 msgid "URL that provides proxy configuration values."
 msgstr "آخر إصدار تشكيل تمت الترقية إليه"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
-"ما إن كان إيفُليوشن سيبدأ التشغيل في وضع عدم الاتصال بدلاً من وضع الاتصال."
+"ما إن كان إيفُليوشن سيبدأ التشغيل في وضع عدم الاتصال بدلًا من وضع الاتصال."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether crash detection should be done or not"
 msgstr "ما إن كان يجب القيام باكتشاف الانهيار أم لا"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether or not the window should be maximized."
 msgstr "فيما إذا "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "ما إن كان يجب إظهار الشريط الجانبي."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the status bar should be visible."
 msgstr "ما إن كان يجب إظهار شريط الحالة."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
-msgstr "ما إن كان شريط الأدوات مرئياً."
+msgstr "ما إن كان شريط الأدوات مرئيًا."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "ما إن كان سيتم تخطي مربع حوار التحذير في إصدارات التطوير من إيفُليوشن."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in recovery of Evolution is skipped."
 msgstr "ما إن كان سيتم تخطي مربع حوار التحذير عند استرجاع إيفُليوشن."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "ما إن كانت أزرار النافذة يجب أن تكون مرئية."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "أسلوب زر النافذة"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "أزرار النافذة ظاهرة"
 
@@ -19657,29 +20209,9 @@ msgstr "إستيراد ملف _وحيد"
 msgid "Evolution Preferences"
 msgstr "تفضيلات إيفُليوشِن"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "لم يحدَّد اسم مجلّد."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "لا يمكن أن يحتوي اسم المجلّد رمز الأرجاع."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "لا يمكن أن يحتوي اسم المجلّد الرمز \"/\"."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "لا يمكن أن يحتوي اسم المجلّد الرمز \"#\"."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' و '..' أسماء مجلّدات محجوزة."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:335
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s -إيفُليوشن"
@@ -19695,7 +20227,7 @@ msgstr "خطأ تنفيذ %s."
 
 #: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
-msgstr "باك بدي ليس مثبّتاً"
+msgstr "باك بدي ليس مثبّتًا"
 
 #: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
@@ -19704,7 +20236,7 @@ msgstr "لم يمكن تشغيل فتى العلات."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:742
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Djihed Afifi جهاد عفيفي (djihed@gmail.com)\n"
@@ -19712,41 +20244,47 @@ msgstr ""
 "Ahmad Farghal أحمد فرغل (ahmad.farghal@gmail.com)\n"
 "Anas Husseini أنس الحسيني (linux.anas@gmail.com)"
 
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "موقع إيفُليوشِن"
 
-#: ../shell/e-shell-window-commands.c:771
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "حدث خطأ أثناء فتح صفحة الأسئلة الشائعة."
 
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
-msgstr "ا_عمل متصلاً"
+msgstr "ا_عمل متصلًا"
 
-#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "ا_عمل دون اتّصال"
 
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "اعمل دون اتّصال"
 
-#: ../shell/e-shell-window.c:384
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:377
+#, fuzzy
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
 "إيفُليوشن متصل بالانترنت حاليا.  انقر هذا الزر للعمل دون اتصال بالإنترنت."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
-msgstr "يقوم إيفُليوشن حالياً بالتحول لوضع عدم الاتصال."
+msgstr "يقوم إيفُليوشن حاليًا بالتحول لوضع عدم الاتصال."
 
-#: ../shell/e-shell-window.c:398
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:391
+#, fuzzy
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
-"إيفُليوشن غير متصل بالانترنت حالياً.  انقر هذا الزر للعمل على اتصال بالإنترنت."
+"إيفُليوشن غير متصل بالانترنت حاليًا.  انقر هذا الزر للعمل على اتصال بالإنترنت."
 
-#: ../shell/e-shell-window.c:807
+#: ../shell/e-shell-window.c:780
 #, c-format
 msgid "Switch to %s"
 msgstr "تبديل إلى %s"
@@ -19776,9 +20314,9 @@ msgstr "لم يمكن تسجيل OAF"
 msgid "Configuration Database not found"
 msgstr "لم يعثر على قاعدة بيانات الإعداد"
 
-#: ../shell/e-user-creatable-items-handler.c:671
-#: ../shell/e-user-creatable-items-handler.c:681
-#: ../shell/e-user-creatable-items-handler.c:686
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "جديد"
 
@@ -19786,13 +20324,9 @@ msgstr "جديد"
 msgid "New Test"
 msgstr "إختبار جديد"
 
-#: ../shell/test/evolution-test-component.c:108
-msgid "_Test"
-msgstr "اخ_تبار"
-
 #: ../shell/test/evolution-test-component.c:109
 msgid "Create a new test item"
-msgstr "أنشيء عنصر اختبار جديد"
+msgstr "أنشئ عنصر اختبار جديد"
 
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -19828,7 +20362,7 @@ msgid ""
 "With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
-"مرحباً بك في مساعد الاستيراد لإيفُليوشن.\n"
+"مرحبًا بك في مساعد الاستيراد لإيفُليوشن.\n"
 "سيرشدك هذا المساعد خلال عملية\n"
 "استيراد ملفات خارجية إلى إيفُليوشن."
 
@@ -19852,16 +20386,16 @@ msgid ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
-"مرحباً. شكراً على تنزيل هذا إصدار المعاينة هذا\n"
+"مرحبًا. شكرًا على تنزيل هذا إصدار المعاينة هذا\n"
 "من حزمة إيفُليوشن.\n"
 "\n"
-"هذا الإصدار من إيفُليوشن ليس مكتملاً بعد. فبعض المزايا\n"
+"هذا الإصدار من إيفُليوشن ليس مكتملًا بعد. فبعض المزايا\n"
 "غير مكتملة أو لا تعمل بصورة صحيحة.\n"
 "\n"
-"إن أردت إصداراً ثابتاً من إيفُليوشن، ننصحك بإزالة تثبيت هذا\n"
-"الإصدار، وتثبيت الإصدار %s بدلاً منه.\n"
+"إن أردت إصدارًا ثابتًا من إيفُليوشن، ننصحك بإزالة تثبيت هذا\n"
+"الإصدار، وتثبيت الإصدار %s بدلًا منه.\n"
 ".\n"
-"إن وجدت عللاً، رجاءً بلغنا بوجودها عند bugzilla.gnome.org.\n"
+"إن وجدت عللًا، رجاءً بلغنا بوجودها عند bugzilla.gnome.org.\n"
 "لا يأتي هذا البرنامج مع أي ضمانات وهو غير موجه للأشخاصnالذين لا يستطيعون "
 "التحكم في غضبهم.\n"
 "\n"
@@ -19974,7 +20508,7 @@ msgstr "لا توجد مساحة كافية للترقية."
 
 #: ../shell/shell.error.xml.h:8
 msgid "Really delete old data?"
-msgstr "حذف البيانات القديمة فعلاً؟"
+msgstr "حذف البيانات القديمة فعلًا؟"
 
 #: ../shell/shell.error.xml.h:9
 msgid ""
@@ -20023,7 +20557,7 @@ msgid ""
 "can continue."
 msgstr ""
 "ترقية بياناتك وإعداداتك ستحتاج إلى ما يصل إلى {0} من مساحة القرص، لكنك لا "
-"تملك سوى {1} متوفراً.\n"
+"تملك سوى {1} متوفرًا.\n"
 "\n"
 "ستحتاج إلى إفراغ بعض المساحة في دليلك المنزلي قبل المتابعة."
 
@@ -20061,7 +20595,7 @@ msgstr "إحتف_ظ بالبيانات"
 
 #: ../shell/shell.error.xml.h:33
 msgid "_Remind Me Later"
-msgstr "_ذكرني لاحقاً"
+msgstr "_ذكرني لاحقًا"
 
 #: ../shell/shell.error.xml.h:34
 msgid ""
@@ -20072,7 +20606,7 @@ msgid ""
 msgstr ""
 "{1}\n"
 "\n"
-"إن اخترت المتابعة، قد لا تصبح قادراً على النفاذ لبعض بياناتك القديمة.\n"
+"إن اخترت المتابعة، قد لا تصبح قادرًا على النفاذ لبعض بياناتك القديمة.\n"
 
 #: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
@@ -20377,7 +20911,7 @@ msgstr "_حرر مدى الثقة في سلطة إصدار الشهادة"
 #. XXX we shouldn't be popping up dialogs in this code.
 #: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
-msgstr "الشّهادة موجودة أصلاً"
+msgstr "الشّهادة موجودة أصلًا"
 
 #: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
@@ -20690,7 +21224,7 @@ msgstr "احف_ظ مراسَلي المجلد المنتقى كفيكارد"
 msgid "Select All"
 msgstr "إنتق الكل"
 
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
 msgstr "إنتقاء ال_كل"
 
@@ -20759,7 +21293,7 @@ msgstr "ن_قل المراسَل إلى..."
 msgid "_Move Folder Contacts To"
 msgstr "ان_قل مراسَلي المجلد إلى"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_جديد"
 
@@ -20897,192 +21431,6 @@ msgstr "أسبوع عمل"
 msgid "_Open Appointment"
 msgstr "افت_ح موعد"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "انقر هنا لإرفاق ملف"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "انقر هنا لغلق النافذة الحالية"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "انقر هنا لحفظ النافذة الحالية"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "انقر هنا لعرض المساعدة المتوفرة"
-
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "غلق"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "نسخ النّص المنتقى للحافظة الوسيطة"
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "قص النّص المنتقى للحافظة الوسيطة"
-
-#: ../ui/evolution-editor.xml.h:10
-msgid "I_nsert"
-msgstr "أ_درج"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "لصق نص من الحافظة الوسيطة"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "إنتقاء كامل النّص"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_مساعدة"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_خيارات"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "حدث يستغرق يوماً بأكمله"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "حدث يستغرق _يوماً بأكمله"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "صنف كخصوصي"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "تصنيف كخاص"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "تصنيف كعام"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "انقر هنا لتعيين أو إزالة المنبهات لهذا الحدث"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "أدرج خيارات إرسال متقدمة"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "إجعل هذا حدثاً متكرراً"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "_عام"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "الاستعلام عن معلومات متوفر/مشغول للحضور"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "حقل ال_دور"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "_خيارات الإرسال"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "اعرض حالتي كمش_غول في هذا الوقت"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "المنطقة ال_زمنية"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "تحديد ما إذا كان حقل نوع الحضور ظاهراً"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "تحديد ما إذا كان حقل تأكيد الحضور ظاهراً"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "تحديد ما إذا كان حقل الدور ظاهراً"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "تحديد ما إذا كان حقل الحالة ظاهراً"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "تحديد ما إذا كنت تريد إظهار المنطقة الزمنية"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "تحديد ما إذا كنت تريد إظهار الفئات"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "تغيير ما إذا كان الحدث يستغرق يوماً بأكمله"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "تحديد ما إذا كنت تريد تغيير حالتك إلى مشغول في هذا الوقت"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "ال_منبّهات"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "ال_فئات"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "التّ_صنيف"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_خصوصي"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_متفرّغ/مشغول"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_خاص"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_تأكيد الحضور"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "ت_كرار"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "حقل ال_حالة"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "حقل ال_نوع"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "إلغاء عمليّة البريد الحاليّة"
@@ -21093,15 +21441,15 @@ msgstr "نسخ المجلد المُنتقى إلى داخل مجلد آخر"
 
 #: ../ui/evolution-mail-global.xml.h:4
 msgid "Create a new folder for storing mail"
-msgstr "أنشيء مجلداً جديداً لتخزين البريد"
+msgstr "أنشئ مجلدًا جديدًا لتخزين البريد"
 
 #: ../ui/evolution-mail-global.xml.h:5
 msgid "Create or edit Search Folder definitions"
-msgstr "أنشيء أو حرر تعريفات مجلّد البحث"
+msgstr "أنشئ أو حرر تعريفات مجلّد البحث"
 
 #: ../ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
-msgstr "أنشيء أو حرر قواعد ترشيح البريد الجديد"
+msgstr "أنشئ أو حرر قواعد ترشيح البريد الجديد"
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Download messages of accounts/folders marked for offline"
@@ -21122,7 +21470,7 @@ msgstr "نقل المجلد المُنتقى إلى مجلد آخر"
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "إزالة جميع الرّسائل المحذوفة من كل المجلّدات نهائيّاً"
+msgstr "إزالة جميع الرّسائل المحذوفة من كل المجلّدات نهائيًّا"
 
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
@@ -21138,7 +21486,7 @@ msgstr "اظهر معاينة الرسالة تحت قائمة الرسائل"
 
 #: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview side-by-side with the message list"
-msgstr "اظهر معاينة الرسالة وقائمة الرسائل جنباً إلى جنب"
+msgstr "اظهر معاينة الرسالة وقائمة الرسائل جنبًا إلى جنب"
 
 #: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview window"
@@ -21247,7 +21595,7 @@ msgstr "أخفي الرّسائل المقر_وءة"
 #: ../ui/evolution-mail-list.xml.h:15
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
-msgstr "أخفي الرّسائل المحذوفة عوضاً عن إظهارها بخطٍّ يشطبها"
+msgstr "أخفي الرّسائل المحذوفة عوضًا عن إظهارها بخطٍّ يشطبها"
 
 #: ../ui/evolution-mail-list.xml.h:16
 msgid "Mar_k All Messages as Read"
@@ -21263,7 +21611,7 @@ msgstr "لصق رسالة (أو رسائل) من الحافظة"
 
 #: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "إزالة جميع الرّسائل المحذوفة من هذا المجلّد نهائيّاً"
+msgstr "إزالة جميع الرّسائل المحذوفة من هذا المجلّد نهائيًّا"
 
 #: ../ui/evolution-mail-list.xml.h:20
 msgid "Permanently remove this folder"
@@ -21291,7 +21639,7 @@ msgstr "انتق _كل الرسائل"
 
 #: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
-msgstr "إنتقاء جميع الرّسائل غير المنتقاة حاليّاً و تلك الرّسائل فقط"
+msgstr "إنتقاء جميع الرّسائل غير المنتقاة حاليًّا و تلك الرّسائل فقط"
 
 #: ../ui/evolution-mail-list.xml.h:27
 msgid "Select all messages in the same thread as the selected message"
@@ -21311,15 +21659,15 @@ msgstr "أظهر الرسائل الم_خفية"
 
 #: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
-msgstr "اظهر الرّسائل المخفيّة مؤقّتاً"
+msgstr "اظهر الرّسائل المخفيّة مؤقّتًا"
 
 #: ../ui/evolution-mail-list.xml.h:32
 msgid "Temporarily hide all messages that have already been read"
-msgstr "إخفاء جميع الرّسائل المقروءة مؤقّتاً"
+msgstr "إخفاء جميع الرّسائل المقروءة مؤقّتًا"
 
 #: ../ui/evolution-mail-list.xml.h:33
 msgid "Temporarily hide the selected messages"
-msgstr "أخفي الرّسائل المنتقاة مؤقتاً"
+msgstr "أخفي الرّسائل المنتقاة مؤقتًا"
 
 #: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
@@ -21357,7 +21705,7 @@ msgstr "تطبيق قواعد الترشيح على الرسائل المنتق�
 
 #: ../ui/evolution-mail-message.xml.h:7
 msgid "Check for _Junk"
-msgstr "فحص بحثاً عن النفاية"
+msgstr "فحص بحثًا عن النفاية"
 
 #: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
@@ -21385,39 +21733,39 @@ msgstr "نسخ الرسائل المنتقاة إلى الحافظة"
 
 #: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
-msgstr "أنشيء _قاعدة"
+msgstr "أنشئ _قاعدة"
 
 #: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for these recipients"
-msgstr "أنشيء مجلّد بحث لهؤلاء المرسَل إليهم"
+msgstr "أنشئ مجلّد بحث لهؤلاء المرسَل إليهم"
 
 #: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this mailing list"
-msgstr "أنشيء مجلّد بحث للقائمة البريدية هذه"
+msgstr "أنشئ مجلّد بحث للقائمة البريدية هذه"
 
 #: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this sender"
-msgstr "أنشيء مجلّد بحث لهذا المرسِل"
+msgstr "أنشئ مجلّد بحث لهذا المرسِل"
 
 #: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a Search Folder for this subject"
-msgstr "أنشيء مجلّد بحث لهذا الموضوع"
+msgstr "أنشئ مجلّد بحث لهذا الموضوع"
 
 #: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
-msgstr "أنشيء قانون لترشيح الرّسائل من هذا المرسِل"
+msgstr "أنشئ قانون لترشيح الرّسائل من هذا المرسِل"
 
 #: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
-msgstr "أنشيء قانون لترشيح الرّسائل إلى هؤلاء المرسَل إليهم"
+msgstr "أنشئ قانون لترشيح الرّسائل إلى هؤلاء المرسَل إليهم"
 
 #: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "أنشيء قانون لترشيح الرّسائل إلى هذه القائمة البريدية"
+msgstr "أنشئ قانون لترشيح الرّسائل إلى هذه القائمة البريدية"
 
 #: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
-msgstr "أنشيء قانون لترشيح الرّسائل التي لها هذا العنوان"
+msgstr "أنشئ قانون لترشيح الرّسائل التي لها هذا العنوان"
 
 #: ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected messages to the clipboard"
@@ -21477,7 +21825,7 @@ msgstr "تصَفية بناءً على ال_موضوع..."
 
 #: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
-msgstr "رشح الرسائل المنتقاه بحثاً عن البريد النفاية"
+msgstr "رشح الرسائل المنتقاه بحثًا عن البريد النفاية"
 
 #: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected messages for follow-up"
@@ -21784,6 +22132,10 @@ msgstr "تح_جيم"
 msgid "_Zoom In"
 msgstr "ت_كبير"
 
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "غلق"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "شريط الأدوات الرّئيسي"
@@ -21820,22 +22172,6 @@ msgstr "اعرض التذكير المنتقى"
 msgid "_Open Memo"
 msgstr "ا_فتح تذكير"
 
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "انقر غيِّر / اعرض تفاصيل حالة المهمة"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "تفاصيل الحالة"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "منطقة زمنية"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "تفاصيل ال_حالة"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "انسخ المهام المنتقاه"
@@ -22029,50 +22365,55 @@ msgid "View/Hide the Status Bar"
 msgstr "اعرض/إخفِ شريط الحالة"
 
 #: ../ui/evolution.xml.h:39
+#, fuzzy
+msgid "Work _Offline"
+msgstr "اعمل دون اتّصال"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_حوْل"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "ا_غلق النّافذة"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "انس كلمات ال_سر"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
-msgstr "الأسئلة الأكثر _شيوعاً"
+msgstr "الأسئلة الأكثر _شيوعًا"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "ا_خفِ الأزرار"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "أي_قونات فقط"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "مرجع _سريع"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "إ_نهِ"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "مظهر المُ_بدّل"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "خيارات ال_مزامنة..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "_نص فقط"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_نافذة"
 
@@ -22220,7 +22561,7 @@ msgstr "احفظ المشهد الحالي"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 msgid "_Create new view"
-msgstr "انشيء مش_هد جديد"
+msgstr "أنشئ مش_هد جديد"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Replace existing view"
@@ -22248,7 +22589,7 @@ msgstr "الم_شهد الحالي"
 #: ../widgets/menus/gal-view-menus.c:315
 #, c-format
 msgid "Select View: %s"
-msgstr "انتقِ مشهداً: %s"
+msgstr "انتقِ مشهدًا: %s"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Current view is a customized view"
@@ -22264,7 +22605,7 @@ msgstr "احفظ المشهد المخصص الحالي"
 
 #: ../widgets/menus/gal-view-menus.c:383
 msgid "Create or edit views"
-msgstr "انشيء أو حرّر مَشَاهِد"
+msgstr "أنشئ أو حرّر مَشَاهِد"
 
 #: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
@@ -22286,39 +22627,10 @@ msgstr "نوع المشهد"
 msgid "Type of view:"
 msgstr "نوع المشهد:"
 
-#: ../widgets/misc/e-attachment-bar.c:108
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: ../widgets/misc/e-attachment-bar.c:114
-#, fuzzy, c-format
-msgid "%.1f KB"
-msgstr "%s ك.بايت"
-
-#: ../widgets/misc/e-attachment-bar.c:117
-#, fuzzy, c-format
-msgid "%.1f MB"
-msgstr "%.0fم"
-
-#: ../widgets/misc/e-attachment-bar.c:120
-#, fuzzy, c-format
-msgid "%.1f GB"
-msgstr "%.0fج"
-
-#: ../widgets/misc/e-attachment-bar.c:1168
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "شريط المرفقات"
 
-#: ../widgets/misc/e-attachment-bar.c:1414
-#, fuzzy
-msgid "Recent Docu_ments"
-msgstr "نسبة مكملة"
-
 #: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
 #: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
@@ -22328,7 +22640,7 @@ msgstr "لا يمكن إرفاق الملف %s: %s"
 #: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
-msgstr "لا يمكن إرفاق الملف %s: ليس ملفّاً اعتياديّاً"
+msgstr "لا يمكن إرفاق الملف %s: ليس ملفًّا اعتياديًّا"
 
 #: ../widgets/misc/e-attachment.glade.h:1
 msgid "Attachment Properties"
@@ -22397,16 +22709,16 @@ msgid "Y2"
 msgstr "ص2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "أدنى عرض"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "أدنى عرض"
 
@@ -22562,7 +22874,7 @@ msgstr "موسع"
 
 #: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
-msgstr "ما إن كان الموسع موسعاً أم لا"
+msgstr "ما إن كان الموسع موسعًا أم لا"
 
 #: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
@@ -22590,7 +22902,7 @@ msgstr "قطعة التسمية"
 
 #: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
-msgstr "القطعة التي سيتم عرضها عوضاً عن شارة الموسع الاعتيادية"
+msgstr "القطعة التي سيتم عرضها عوضًا عن شارة الموسع الاعتيادية"
 
 #: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
 msgid "Expander Size"
@@ -22670,7 +22982,16 @@ msgid ""
 "should instead select the timezone from the drop-down combination box below."
 msgstr ""
 "خريطة تفاعلية تعتمد على الماوس لتحديد المنطقة الزمنية. مستخدموا لوحة "
-"المفاتيح عليهم انتقاء المنطقة الزمنية من مربع التحرير والسرد عوضاً عن هذا."
+"المفاتيح عليهم انتقاء المنطقة الزمنية من مربع التحرير والسرد عوضًا عن هذا."
+
+#: ../widgets/misc/e-online-button.c:112
+#, fuzzy
+msgid "Online"
+msgstr "ضمن السّياق"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr ""
 
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
@@ -22696,61 +23017,61 @@ msgstr "طراز الانسياب"
 msgid "Column width"
 msgstr "عرض العمود"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "ابحث"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "انقر هنا لتغيير نوع البحث"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "ا_بحث"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "ا_بحث الآن"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "ا_مسح"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "هوية العنصر"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "نص"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1009
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "أ_ظهر:"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1026
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "ابح_ث :"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1038
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " ف_ي"
 
-#: ../widgets/misc/e-selection-model-array.c:574
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "صف المؤشّر"
 
-#: ../widgets/misc/e-selection-model-array.c:581
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "عمود المؤشّر"
@@ -22791,13 +23112,9 @@ msgstr "<b>تعقب الحالة</b>"
 msgid "A_uto-delete sent item"
 msgstr "حذف تل_قائي للعنصر المرسل"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "تصنيف"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
-msgstr "انش_يء عنصراً مرسلاً لتتبع المعلومات"
+msgstr "انش_يء عنصرًا مرسلًا لتتبع المعلومات"
 
 #: ../widgets/misc/e-send-options.glade.h:8
 msgid "Deli_vered and opened"
@@ -22901,14 +23218,14 @@ msgid "_When opened:"
 msgstr "_عند الفتح:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:289
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:295
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% تام)"
@@ -23117,7 +23434,7 @@ msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (عنصر واحد)"
 msgstr[1] "%s : %s (عنصرين)"
 msgstr[2] "%s : %s (%d عناصر)"
-msgstr[3] "%s : %s (%d عنصراً)"
+msgstr[3] "%s : %s (%d عنصرًا)"
 
 #: ../widgets/table/e-table-group-container.c:351
 #, c-format
@@ -23126,83 +23443,83 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (عنصر واحد)"
 msgstr[1] "%s (عنصرين)"
 msgstr[2] "%s (%d عناصر)"
-msgstr[3] "%s (%d عنصراً)"
+msgstr[3] "%s (%d عنصرًا)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "ألوان صفوف متناوبة"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
 #: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "شبكة رسم أفقيّة"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
 #: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "شبكة رسم عموديّة"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
 #: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "تركيز الرّسم"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "نمط المؤشّر"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "نموذج الانتقاء"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
 #: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "عتبة الطّول"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
 #: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "ارتفاع صفوف منتظم"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "مجمّد"
 
@@ -23212,11 +23529,11 @@ msgstr "خصّص المشهد الحالي"
 
 #: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
-msgstr "رتّب ت_صاعدياً"
+msgstr "رتّب ت_صاعديًا"
 
 #: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
-msgstr "رتّب ت_نازلياً"
+msgstr "رتّب ت_نازليًا"
 
 #: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
@@ -23278,24 +23595,24 @@ msgstr "معلومات التّرتيب"
 msgid "Tree"
 msgstr "شجرة"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "ترويسة الجدول"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "طراز الجدول"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "صف المؤشر"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
 #: ../widgets/table/e-tree.c:3356
 msgid "Always search"
-msgstr "ابحث دائماً"
+msgstr "ابحث دائمًا"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "استخدم النّقر للإضافة"
 
@@ -23415,6 +23732,110 @@ msgstr "سياق مراسِل فوري"
 msgid "Handle Popup"
 msgstr "معالجة القافزة"
 
+#~ msgid "_Contact"
+#~ msgstr "_مراسَل"
+
+#~ msgid "Contact _List"
+#~ msgstr "_قائمة مراسَلين"
+
+#~ msgid "Address _Book"
+#~ msgstr "_دفتر العناوين"
+
+#~ msgid "Mem_o"
+#~ msgstr "ت_ذكير"
+
+#~ msgid "_Shared memo"
+#~ msgstr "تذكيرات _مشاركة"
+
+#~ msgid "Memo li_st"
+#~ msgstr "قائ_مة التذكيرات"
+
+#~ msgid "Assigne_d Task"
+#~ msgstr "مهمّة _مسندة"
+
+#~ msgid "Tas_k list"
+#~ msgstr "قائمة م_هام"
+
+#~ msgid "_Save Message"
+#~ msgstr "احف_ظ الرّسالة"
+
+#~ msgid "folder-display|%s (%u)"
+#~ msgstr "%s (%u)"
+
+#~ msgid "_Mail Message"
+#~ msgstr "_رسالة بريديّة"
+
+#~ msgid "Mail _Folder"
+#~ msgstr "م_جلد بريد"
+
+#, fuzzy
+#~ msgid ""
+#~ "The selected folder does not have enough permissions to create the file"
+#~ msgstr "ليست لديك تصاريح كافية لحذف هذا البريد."
+
+#, fuzzy
+#~ msgid "A plugin that manages the Startup wizard."
+#~ msgstr "ملحق يدير مساعد بدء التشغيل."
+
+#~ msgid "Startup wizard"
+#~ msgstr "مساعد بدء التشغيل"
+
+#~ msgid "_Test"
+#~ msgstr "اخ_تبار"
+
+#, fuzzy
+#~ msgid ""
+#~ "'{0}' is a read-only calendar source. Change Calendar to one that can "
+#~ "accept appointments."
+#~ msgstr ""
+#~ "'{0}' مصدر تقويم للقرائة فقط. انتقل لمشهد التقويم ثم اختر تقويما يقبل "
+#~ "المواعيد."
+
+#~ msgid "There is no configuration option for this plugin."
+#~ msgstr "لا يوجد خيار تشكيل لهذا الملحق."
+
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "وصف مَقطعي لإعدادات الطابعة الحالية."
+
+#~ msgid "No folder name specified."
+#~ msgstr "لم يحدَّد اسم مجلّد."
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "لا يمكن أن يحتوي اسم المجلّد رمز الأرجاع."
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "لا يمكن أن يحتوي اسم المجلّد الرمز \"/\"."
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "لا يمكن أن يحتوي اسم المجلّد الرمز \"#\"."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "'.' و '..' أسماء مجلّدات محجوزة."
+
+#~ msgid "All Day Event"
+#~ msgstr "حدث يستغرق يومًا بأكمله"
+
+#~ msgid "Send _Options"
+#~ msgstr "_خيارات الإرسال"
+
+#~ msgid "Status Details"
+#~ msgstr "تفاصيل الحالة"
+
+#~ msgid "Time Zone"
+#~ msgstr "منطقة زمنية"
+
+#, fuzzy
+#~ msgid "%.1f KB"
+#~ msgstr "%s ك.بايت"
+
+#, fuzzy
+#~ msgid "%.1f MB"
+#~ msgstr "%.0fم"
+
+#, fuzzy
+#~ msgid "%.1f GB"
+#~ msgstr "%.0fج"
+
 #~ msgid "Enable attachment reminder plugin"
 #~ msgstr "فعّل ملحق مذكّر المرفقات"
 
@@ -23504,7 +23925,7 @@ msgstr "معالجة القافزة"
 #~ "folder &quot;{0}&quot;?"
 #~ msgstr ""
 #~ "هل أنت متأكد أنك تريد إزالة كل الرسائل المحذوفة في المجلد &quot;{0}&quot; "
-#~ "نهائياً؟"
+#~ "نهائيًا؟"
 
 #~ msgid "Delete &quot;{0}&quot;?"
 #~ msgstr "حذف &quot;{0}&quot;؟"
@@ -23515,9 +23936,6 @@ msgstr "معالجة القافزة"
 #~ msgid "Only on _Current Folder"
 #~ msgstr "فقط في الم_جلد الحالي"
 
-#~ msgid "_Continue Editing"
-#~ msgstr "تابع الت_حرير"
-
 #~ msgid "_Refresh:"
 #~ msgstr "أ_نعِش:"
 
@@ -23563,9 +23981,6 @@ msgstr "معالجة القافزة"
 #~ msgid "Save As"
 #~ msgstr "احفظ كـ"
 
-#~ msgid "Save Draft"
-#~ msgstr "احفظ _مسودّة"
-
 #~ msgid "Save in folder..."
 #~ msgstr "احفظ في المجلّد..."
 
@@ -23603,7 +24018,7 @@ msgstr "معالجة القافزة"
 
 #, fuzzy
 #~ msgid "Select color for label..."
-#~ msgstr "ا_نتقِ تاريخاً..."
+#~ msgstr "ا_نتقِ تاريخًا..."
 
 #~ msgid "<span weight=\"bold\">Labels and Colors</span>"
 #~ msgstr "<span weight=\"bold\">التسميات و الألوان</span>"
@@ -23713,9 +24128,6 @@ msgstr "معالجة القافزة"
 #~ msgid "Mail Remote"
 #~ msgstr "بريد عن بعد"
 
-#~ msgid "_Phone List"
-#~ msgstr "قائمة ال_هاتف"
-
 #~ msgid "Emulate label resize"
 #~ msgstr "حاكِ تحجيم العنوان"
 
@@ -23750,7 +24162,7 @@ msgstr "معالجة القافزة"
 #~ "The changed email or name of this contact already\n"
 #~ "exists in this folder.  Would you like to add it anyway?"
 #~ msgstr ""
-#~ "العنوان البريدي أو الاسم لهذا المراسَل موجود مسبقاً\n"
+#~ "العنوان البريدي أو الاسم لهذا المراسَل موجود مسبقًا\n"
 #~ "في هذا المجلّد.  هل تودّ إضافته على كل حال؟"
 
 #~ msgid "Valid signature, cannot verify sender"
@@ -23945,7 +24357,7 @@ msgstr "معالجة القافزة"
 #~ msgstr "إسألني فيما إذا كنتُ أريد إرسال وصل قراءة"
 
 #~ msgid "Never send back a read receipt"
-#~ msgstr "عدم إرسال وصل قراءة أبداً"
+#~ msgstr "عدم إرسال وصل قراءة أبدًا"
 
 #~ msgid "Read Receipts"
 #~ msgstr "إخطار بالقراءة"
@@ -23955,13 +24367,13 @@ msgstr "معالجة القافزة"
 
 #~ msgid ""
 #~ "Unless the message is sent to a mailing list, and not to me personally"
-#~ msgstr "إلّا إذا كانت هذه الرّسالة مرسلةً إلى قائمة بريديّة، و ليس لي شخصيّاً"
+#~ msgstr "إلّا إذا كانت هذه الرّسالة مرسلةً إلى قائمة بريديّة، و ليس لي شخصيًّا"
 
 #~ msgid ""
 #~ "When you receive an email with a read receipt request, what should "
 #~ "Evolution do?"
 #~ msgstr ""
-#~ "عندما تستلم بريداً إلكترونيّاً مع طلبٍ لوصل إفادةٍ بالقراءة، ما الذي يفترض "
+#~ "عندما تستلم بريدًا إلكترونيًّا مع طلبٍ لوصل إفادةٍ بالقراءة، ما الذي يفترض "
 #~ "إيفُليوشِن فعله؟"
 
 #~ msgid "The orientation of the tray."
@@ -23995,13 +24407,13 @@ msgstr "معالجة القافزة"
 #~ msgstr ""
 #~ "بعض مرشحات نتسكيب للبريد الإلكتروني الخاصة بك مبنية\n"
 #~ "على أولويات البريد، والتي لا يستخدمها إيفُليوشن.\n"
-#~ "عوضاً عن هذا، يوفر إيفُليوشن تقييمات في المدى\n"
+#~ "عوضًا عن هذا، يوفر إيفُليوشن تقييمات في المدى\n"
 #~ "بين -٣ و ٣ يمكن تعيينها لرسائل البريد الإلكتروني\n"
 #~ "وفلترتها على هذا الأساس.\n"
 #~ "\n"
 #~ "كحل بديل، تمت إضافة مجموعة من المرشحات\n"
 #~ "تسمى \"مرشح الأولوية\" لتحويل أولويات نتسكيب للبريد الإلكتروني\n"
-#~ "إلى تقييمات إيفُليوشن، وتستخدم المرشحات المعنية التقييمات بدلاً\n"
+#~ "إلى تقييمات إيفُليوشن، وتستخدم المرشحات المعنية التقييمات بدلًا\n"
 #~ "من الأولويات. افحص المرشحات المستوردة للتأكد من أن كل شئ\n"
 #~ "يعمل كما هو مفترض."
 
@@ -24026,7 +24438,7 @@ msgstr "معالجة القافزة"
 #~ "بعض مرشحات نتسكيب للبريد الإلكتروني تفحص\n"
 #~ "متن الرسائل لمقارنة جملها بجملة محددة،\n"
 #~ "وهذه الميزة لا يدعمها إيفُليوشن. تم تعديل هذه\n"
-#~ "المرشحات لفحص المتن بحثاً عن هذه الجملة\n"
+#~ "المرشحات لفحص المتن بحثًا عن هذه الجملة\n"
 #~ "والتأكد من وجودها أو عدم وجودها في المتن."
 
 #~ msgid "Evolution is importing your old Netscape data"
diff --git a/po/cs.po b/po/cs.po
index 51c53abac2..a82887a1d5 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-21 15:51+0200\n"
-"PO-Revision-Date: 2008-06-21 15:41+0100\n"
+"POT-Creation-Date: 2008-07-27 20:54+0200\n"
+"PO-Revision-Date: 2008-07-27 20:49+0100\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -161,7 +161,7 @@ msgid "calendar view for one or more days"
 msgstr "pohled na kalendář pro jeden nebo více dnů"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:758
 msgid "%A %d %b %Y"
 msgstr "%a %d. %b %Y"
 
@@ -172,7 +172,7 @@ msgstr "%a %d. %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
+#: ../calendar/gui/calendar-component.c:761
 #: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
 #: ../calendar/gui/e-week-view-main-item.c:340
 msgid "%a %d %b"
@@ -181,9 +181,9 @@ msgstr "%a %d %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:768
+#: ../calendar/gui/calendar-component.c:770
 msgid "%a %d %b %Y"
 msgstr "%a %d. %b %Y"
 
@@ -191,10 +191,10 @@ msgstr "%a %d. %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:797
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
@@ -204,7 +204,7 @@ msgstr "%d. %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:787
 #: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
 #: ../calendar/gui/e-week-view-main-item.c:354
 msgid "%d %b"
@@ -346,9 +346,10 @@ msgstr "aktivovat"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
+#, fuzzy
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr ""
 "'{0}' je zdroj adresáře pouze pro čtení. Přepněte na náhled kontaktů a "
 "zvýrazněte adresář, který může kontakty přijmout."
@@ -396,10 +397,11 @@ msgid "Could not remove addressbook."
 msgstr "Nemohu odstranit adresář."
 
 #: ../addressbook/addressbook.error.xml.h:11
+#, fuzzy
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
 "Nyní můžete z Evolution přistupovat pouze k adresáři GroupWise. Použijte "
 "prosím některého jiného poštovního klienta GroupWise k vytvoření složek "
@@ -525,8 +527,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:35
 #, fuzzy
-msgid ""
-"You do not have enough permissions to delete contact in this Address Book."
+msgid "You do not have permission to delete contacts in this address book."
 msgstr "Nemáte dostatečná oprávnění pro smazání této pošty."
 
 #: ../addressbook/addressbook.error.xml.h:36
@@ -567,7 +568,7 @@ msgstr "Po_užít jak je"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -609,7 +610,7 @@ msgstr "Zde nastavte automatické dokončování"
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1334
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:396
+#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
@@ -656,8 +657,9 @@ msgstr "Zde spravujte své certifikáty S/MIME"
 #: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:311
-#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1455
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "V tomto počítači"
 
@@ -670,15 +672,16 @@ msgstr "V tomto počítači"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:485
-#: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1055
+#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Osobní"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "Na serverech LDAP"
@@ -736,7 +739,7 @@ msgstr "_Zkopírovat obsah adresáře lokálně pro práci při odpojení"
 #: ../calendar/gui/dialogs/calendar-setup.c:377
 #: ../calendar/gui/dialogs/calendar-setup.c:388
 #: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2366
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Obecné"
@@ -762,7 +765,7 @@ msgid "Details"
 msgstr "Podrobnosti"
 
 #: ../addressbook/gui/component/addressbook-config.c:978
-#: ../mail/em-folder-browser.c:959
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "Vyhledávání"
 
@@ -776,12 +779,12 @@ msgid "Address Book Properties"
 msgstr "Vlastnosti adresáře"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Převádím..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Převádím `%s':"
@@ -862,11 +865,11 @@ msgstr "Uložit jako Vcard..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
+#: ../calendar/gui/calendar-component.c:620
+#: ../calendar/gui/e-calendar-table.c:1588
 #: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2095 ../mail/em-folder-view.c:1346
+#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../mail/em-folder-tree.c:2095 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -1252,7 +1255,7 @@ msgstr "karty"
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
 #: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:401
 msgid "minutes"
 msgstr "minut"
 
@@ -1358,7 +1361,7 @@ msgstr "Telefon"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Pracovní"
 
@@ -1380,7 +1383,7 @@ msgid "_Birthday:"
 msgstr "Na_rozeniny:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1848
 msgid "_Calendar:"
@@ -1485,7 +1488,7 @@ msgstr "Adresa"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:521
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
 #: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
@@ -2503,6 +2506,7 @@ msgid "Service"
 msgstr "Služba"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:693
 #: ../plugins/save-calendar/csv-format.c:375
@@ -2810,7 +2814,7 @@ msgstr "Č_lenové"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
 #: ../addressbook/gui/widgets/e-addressbook-view.c:213
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:507
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Kniha"
 
@@ -2875,8 +2879,8 @@ msgstr "E-mail"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:162
-#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Jakékoliv políčko obsahuje"
 
@@ -2906,7 +2910,7 @@ msgstr[2] "%d kontaktů"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-addressbook-view.c:227
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:514
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Dotaz"
 
@@ -2917,7 +2921,7 @@ msgstr "Chyba při získávání zobrazení knihy"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-table.c:3353
 #: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
@@ -2949,8 +2953,8 @@ msgid "Save as vCard..."
 msgstr "Uložit jako VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:1124
-#: ../calendar/gui/e-calendar-table.c:1365
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1566
 #: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
@@ -3001,19 +3005,18 @@ msgid "Mo_ve to Address Book..."
 msgstr "Př_esunout do adresáře..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "_Vyjmout"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:453
-#: ../calendar/gui/e-calendar-table.c:1373
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1574
 #: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
 #: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:996
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2045
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopírovat"
 
@@ -3065,7 +3068,7 @@ msgstr "Telefon do auta"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:143
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3210,11 +3213,11 @@ msgstr "WWW stránka"
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
 #: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Šířka"
@@ -3225,11 +3228,11 @@ msgstr "Šířka"
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
 #: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Výška"
@@ -3259,7 +3262,18 @@ msgstr "Maximální délka názvu pole"
 msgid "Column Width"
 msgstr "Šířka sloupce"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:173
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Hledat kontakt."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3273,7 +3287,7 @@ msgstr ""
 "\n"
 "nebo dvakrát klikněte sem k vytvoření nového kontaktu."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:176
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3287,7 +3301,7 @@ msgstr ""
 "\n"
 "K vytvoření nového kontaktu dvakrát klikněte sem."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3297,7 +3311,7 @@ msgstr ""
 "\n"
 "Hledat kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3307,7 +3321,7 @@ msgstr ""
 "\n"
 "V tomto zobrazení nejsou viditelné žádné položky."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:500
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adaptér"
 
@@ -3337,7 +3351,7 @@ msgid "_Open Link in Browser"
 msgstr "_Otevřít odkaz v prohlížeči"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "_Kopírovat umístění odkazu"
 
@@ -3385,7 +3399,7 @@ msgstr "Video chat"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:806
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/gnome-cal.c:2376
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
@@ -3401,8 +3415,7 @@ msgstr "Kalendář"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "Volno/obsazeno"
 
@@ -3424,12 +3437,14 @@ msgid "Web Log"
 msgstr "Weblog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2355
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Narozeniny"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2356
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Výročí"
 
@@ -3475,7 +3490,7 @@ msgstr "Kontakt Já nedefinován"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Přístup zamítnut"
 
@@ -3497,11 +3512,11 @@ msgstr "Protokol není podporován"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:635 ../calendar/gui/print.c:2523
 msgid "Canceled"
 msgstr "Zrušeno"
 
@@ -3780,7 +3795,7 @@ msgstr "Uložit do adresáře"
 msgid "Card View"
 msgstr "Zobrazení karty"
 
-#: ../addressbook/importers/evolution-csv-importer.c:623
+#: ../addressbook/importers/evolution-csv-importer.c:658
 #: ../addressbook/importers/evolution-ldif-importer.c:498
 #: ../addressbook/importers/evolution-vcard-importer.c:250
 #: ../calendar/importers/icalendar-importer.c:306
@@ -3788,27 +3803,27 @@ msgstr "Zobrazení karty"
 msgid "Importing..."
 msgstr "Importuji..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:825
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV nebo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "Importér Outlook CSV a Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:834
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV nebo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Importér Mozilla CSV a Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:843
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV nebo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importér Evolution CVS a Tab"
 
@@ -4103,19 +4118,17 @@ msgstr "Neobsloužená chyba"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-#, fuzzy
 msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
-"'{0}' je zdroj kalendáře pouze pro čtení. Přepněte na náhled kalendáře a "
-"zvýrazněte kalendář, který může přijmout události."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
+#, fuzzy
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
 "'{0}' je zdroj kalendáře pouze pro čtení. Přepněte na náhled kalendáře a "
 "zvýrazněte kalendář, který může přijmout události."
@@ -4382,7 +4395,8 @@ msgid "The calendar is not marked for offline usage."
 msgstr "Kalendář nebyl označen pro práci off-line."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
+#, fuzzy
+msgid "The memo list is not marked for offline usage."
 msgstr "Tento seznam poznámek nebyl označen pro používání off-line"
 
 #: ../calendar/calendar.error.xml.h:55
@@ -4478,8 +4492,7 @@ msgstr "Vaše úkoly nebudou k dispozici, dokud nebude Evolution znovu spuštěn
 msgid "_Discard Changes"
 msgstr "Za_hodit změny"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:492
-#: ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "_Uložit"
 
@@ -4544,12 +4557,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Nemohu zapsat blok aplikace ToDo pilota"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2357
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "Kalendář a úkoly"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:1403
 msgid "Calendars"
 msgstr "Kalendáře"
 
@@ -4591,17 +4604,17 @@ msgstr "P_oznámky"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
+#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
 #: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "Poznámky"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/e-calendar-table.c:696 ../calendar/gui/e-tasks.c:1429
 #: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-component.c:540
+#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
 #: ../calendar/gui/tasks-control.c:508
 #: ../calendar/importers/icalendar-importer.c:74
 #: ../calendar/importers/icalendar-importer.c:735
@@ -4639,7 +4652,7 @@ msgstr[2] "minut"
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:397
+#: ../plugins/google-account-setup/google-source.c:402
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "hodina"
@@ -4657,8 +4670,8 @@ msgstr "Události"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1595
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1002
 msgid "Location:"
@@ -4669,14 +4682,15 @@ msgid "Snooze _time:"
 msgstr "_Doba odložení:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:41
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Upravit"
 
@@ -4689,7 +4703,7 @@ msgid "location of appointment"
 msgstr "umístění události"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1577
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
 msgid "No summary available."
 msgstr "Souhrn není k dispozici."
 
@@ -4707,13 +4721,13 @@ msgstr "Informace o místě nejsou k dispozici."
 msgid "You have %d alarms"
 msgstr "Máte %d alarmů"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1707
-#: ../mail/mail-component.c:1584
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1677
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1705
+#: ../mail/mail-component.c:1585
 msgid "Warning"
 msgstr "Varování"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1681
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4725,7 +4739,7 @@ msgstr ""
 "vytvořena k poslání e-mailu. Evolution namísto toho\n"
 "zobrazí dialogové okno pro běžnou připomínku."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1713
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4742,7 +4756,7 @@ msgstr ""
 "\n"
 "Opravdu chcete spustit tento program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
 msgid "Do not ask me about this program again."
 msgstr "Příště se neptat na tento program."
 
@@ -5297,7 +5311,7 @@ msgstr "Vyčistit události starší než"
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
 #: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:403
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "dnů"
@@ -5306,103 +5320,103 @@ msgstr "dnů"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
+#: ../calendar/gui/calendar-component.c:274
+#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
 #: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
-#: ../calendar/gui/tasks-component.c:231
+#: ../calendar/gui/tasks-component.c:232
 msgid "On The Web"
 msgstr "Na WWW"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Narozeniny a výročí"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Počasí"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:616
 msgid "_New Calendar"
 msgstr "_Nový kalendář"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
+#: ../calendar/gui/calendar-component.c:617
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
 #: ../mail/em-folder-tree.c:2090
 msgid "_Copy..."
 msgstr "_Kopírovat..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
+#: ../calendar/gui/calendar-component.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
 #: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2104
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Vlastnosti"
 
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:950
 msgid "Failed upgrading calendars."
 msgstr "Nemohu aktualizovat kalendáře."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1249
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Nemohu otevřít kalendář '%s' pro tvorbu událostí a schůzek"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1265
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Není k dispozici kalendář pro tvorbu událostí a schůzek"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1378
 msgid "Calendar Source Selector"
 msgstr "Výběr zdroje kalendáře"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Nová událost"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
 msgid "_Appointment"
 msgstr "_Událost"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Vytvořit novou událost"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Nová schůzka"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
 msgid "M_eeting"
 msgstr "_Schůzka"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Vytvořit požadavek na novou schůzku"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Nová celodenní událost"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
 msgid "All Day A_ppointment"
 msgstr "_Celodenní událost"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Vytvořit novou celodenní událost"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Nový kalendář"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Cale_ndar"
 msgstr "_Kalendář"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Vytvořit nový kalendář"
 
@@ -5423,15 +5437,235 @@ msgid "Month View"
 msgstr "Zobrazení měsíce"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#, fuzzy
+msgid "Any Field"
+msgstr "Pole"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Přílohy"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Účastník"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+#, fuzzy
+msgid "Business"
+msgstr "Fax - práce"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+#, fuzzy
+msgid "Category"
+msgstr "Kategorie je"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Klasifikace"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#, fuzzy
+msgid "Competition"
+msgstr "Datum dokončení"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:539
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Důvěrné"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Popis"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "Popis obsahuje"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "Neexistují"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Existují"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+#, fuzzy
+msgid "Favourites"
+msgstr "Mauricius"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+#, fuzzy
+msgid "Holiday"
+msgstr "Dnes"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+#, fuzzy
+msgid "Hot Contacts"
+msgstr "Kontakty"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+#, fuzzy
+msgid "Ideas"
+msgstr "dnů"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+#, fuzzy
+msgid "International"
+msgstr "tradiční"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+#, fuzzy
+msgid "Key Customer"
+msgstr "Přizpůsobit"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+#, fuzzy
+msgid "Miscellaneous"
+msgstr "Různé"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+#, fuzzy
+msgid "Next 7 days"
+msgstr "Úkoly v příštích 7 dnech"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "Organizátor"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+#, fuzzy
+msgid "Phone Calls"
+msgstr "Telefon"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:538
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "Soukromé"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:537 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "Veřejné"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:298
+msgid "Recurrence"
+msgstr "Opakování"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Stav"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+#, fuzzy
+msgid "Strategies"
+msgstr "Kategorie"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40 ../mail/mail-dialogs.glade.h:20
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "Přehled"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Přehled obsahuje"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+#, fuzzy
+msgid "Suppliers"
+msgstr "Odpovědi"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+#, fuzzy
+msgid "Waiting"
+msgstr "Čekám..."
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "obsahuje"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "neobsahuje"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "je"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "není"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Chyba při otevírání kalendáře"
@@ -5448,7 +5682,7 @@ msgstr "Přístup zamítnut při otevírání kalendáře"
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:605
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "Upravit alarm"
 
@@ -5552,6 +5786,7 @@ msgid "hour(s)"
 msgstr "hodin"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:242
 msgid "minute(s)"
 msgstr "minut"
 
@@ -5570,12 +5805,11 @@ msgstr "_Přidat"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarmy"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
-#: ../composer/e-composer-actions.c:63
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "_Navrhnout automatické zobrazovaní příloh"
 
@@ -5648,7 +5882,7 @@ msgid "Display"
 msgstr "Zobrazení"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "pátek"
@@ -5664,7 +5898,7 @@ msgstr ""
 "Dny"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "pondělí"
@@ -5698,7 +5932,7 @@ msgid "S_un"
 msgstr "_ned"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "sobota"
@@ -5716,7 +5950,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Zobrazovat čísla _týdnů v měsíčním přehledu"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "neděle"
@@ -5735,7 +5969,7 @@ msgid "Template:"
 msgstr "Šablona:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "čtvrtek"
@@ -5750,13 +5984,13 @@ msgid "Time format:"
 msgstr "Formát času:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "úterý"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "středa"
@@ -5930,39 +6164,39 @@ msgstr "%s Provedli jste změny. Opominout tyto změny a aktualizovat editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Neprovedli jste změny, aktualizovat editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:516
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Chyba ověření: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:185 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2340
 msgid " to "
 msgstr " do "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2344
 msgid " (Completed "
 msgstr " (Dokončený "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2346
 msgid "Completed "
 msgstr "Dokončený "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2351
 msgid " (Due "
 msgstr " (Termín dokončení "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2353
 msgid "Due "
 msgstr "Termín dokončení "
 
-#: ../calendar/gui/dialogs/comp-editor.c:205
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "Připojená zpráva - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:210
-#: ../calendar/gui/dialogs/comp-editor.c:383 ../composer/e-msg-composer.c:1772
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
 #: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
@@ -5971,29 +6205,217 @@ msgstr[0] "Připojená zpráva"
 msgstr[1] "%d připojené zprávy"
 msgstr[2] "%d připojených zpráv"
 
-#: ../calendar/gui/dialogs/comp-editor.c:454 ../composer/e-msg-composer.c:2059
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
 #: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2046
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "_Přesunout"
 
-#: ../calendar/gui/dialogs/comp-editor.c:456 ../composer/e-msg-composer.c:2061
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2048
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "Zrušit _tažení"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
-#: ../calendar/gui/dialogs/comp-editor.c:2854 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
 #: ../plugins/prefer-plain/prefer-plain.c:74
-#: ../widgets/misc/e-attachment-bar.c:484
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "příloha"
 
-#: ../calendar/gui/dialogs/comp-editor.c:821
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "Nemohu aktualizovat objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:971
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "Upravit událost"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "Schůzka - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "Událost - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Přidělený úkol - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "Úkol - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "Poznámka - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+#, fuzzy
+msgid "No Summary"
+msgstr "Není shrnutí"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "Kliknutím zde uzavřete aktuální okno"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "Kopírovat vybraný text do schránky"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "Vyjmout vybraný text do schránky"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "Kliknutím zde zobrazíte dostupnou nápovědu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "Vložit text ze schránky"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "Kliknutím sem uložíte aktuální okno"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "Vybrat všechen text"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "Klasi_fikace"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
+msgid "_File"
+msgstr "_Soubor"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:45
+msgid "_Help"
+msgstr "Nápo_věda"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+#, fuzzy
+msgid "_Insert"
+msgstr "_Vložit"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "V_olby"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2082
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:54
+msgid "_View"
+msgstr "_Zobrazit"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_Přílohu..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "Kliknutím zde vyberete soubor pro přílohu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "_Kategorie"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "Přepne zobrazení kategorií"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "Časové pás_mo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "Přepne zobrazení pole pro časovou zónu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "Veř_ejné"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "Zařadit mezi veřejné"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "Soukro_mé"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+#, fuzzy
+msgid "Classify as private"
+msgstr "Zařadit mezi soukromé"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "_Důvěrné"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+#, fuzzy
+msgid "Classify as confidential"
+msgstr "Zařadit mezi důvěrné"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "S_loupce Funkce"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "Přepne zobrazení pole pro funkce"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Přepne zobrazení pole RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "Sloupe_c Stav"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "Přepne zobrazení pole stavu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "Sloupec T_yp"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+#, fuzzy
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Přepne zobrazení pole účastníka"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+#, fuzzy
+msgid "Recent Docu_ments"
+msgstr "Dokončeno procent"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "Příloha"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6001,87 +6423,47 @@ msgstr[0] "<b>%d</b> příloha"
 msgstr[1] "<b>%d</b> přílohy"
 msgstr[2] "<b>%d</b> příloh"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1003
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "Skrýt lištu _příloh"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1006
-#: ../calendar/gui/dialogs/comp-editor.c:1589
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "_Zobrazit lištu příloh"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
-#: ../calendar/gui/dialogs/event-page.c:1964
-#: ../calendar/gui/dialogs/task-page.c:1261 ../composer/e-msg-composer.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Odstranit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:2036
 #: ../composer/e-msg-composer.c:1049
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Přidat přílohu..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1613
+#: ../calendar/gui/dialogs/comp-editor.c:2244
 #: ../mail/em-format-html-display.c:2196
 msgid "Show Attachments"
 msgstr "Zobrazit přílohy"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1614
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "Přepne lištu příloh stisknutím klávesy mezery"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2225
-#: ../calendar/gui/dialogs/comp-editor.c:2268
-msgid "Edit Appointment"
-msgstr "Upravit událost"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2231
-#: ../calendar/gui/dialogs/comp-editor.c:2274
-#, c-format
-msgid "Meeting - %s"
-msgstr "Schůzka - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Appointment - %s"
-msgstr "Událost - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2237
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Přidělený úkol - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Task - %s"
-msgstr "Úkol - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2242
-#: ../calendar/gui/dialogs/comp-editor.c:2285
-#, c-format
-msgid "Memo - %s"
-msgstr "Poznámka - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2253
-#: ../calendar/gui/dialogs/comp-editor.c:2295
-msgid "No summary"
-msgstr "Není shrnutí"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2943
-#: ../calendar/gui/dialogs/comp-editor.c:2997
-#: ../calendar/gui/dialogs/comp-editor.c:3021
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Změny provedené v této položce mohou být ztraceny, pokud dorazí aktualizace"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "Nemohu používat aktuální verzi!"
 
@@ -6163,96 +6545,143 @@ msgstr "Postoupit komu:"
 msgid "Enter Delegate"
 msgstr "Zapsat postoupení"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "_Alarmy"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr "Kliknutím sem nastavíte nebo zrušíte alarmy pro tuto událost"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "Opaková_ní"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "Vytvoří opakující se událost"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Možnosti odesílání"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "Vložit pokročilé možnosti odesílání"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "Celo_denní událost"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "Přepne událost na celodenní"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+#, fuzzy
+msgid "Show Time as _Busy"
+msgstr "Zobrazovat čas jako _obsazený"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "Přepne čas jako obsazený"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "V_olno/obsazeno"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "Informace o volném/obsazeném čase pro tuto schůzku"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "_Událost"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Opakování"
-
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.c:2832
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "Tato událost má nastaveny alarmy"
 
-#: ../calendar/gui/dialogs/event-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "_Organizátor:"
 
-#: ../calendar/gui/dialogs/event-page.c:941
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "_Delegáti"
 
-#: ../calendar/gui/dialogs/event-page.c:943
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "Úča_stníci"
 
-#: ../calendar/gui/dialogs/event-page.c:1125
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "Událost bez počátečního data"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "Událost bez konečného data"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
-#: ../calendar/gui/dialogs/memo-page.c:729
-#: ../calendar/gui/dialogs/task-page.c:888
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Počáteční datum je chybné"
 
-#: ../calendar/gui/dialogs/event-page.c:1310
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "Konečné datum je chybné"
 
-#: ../calendar/gui/dialogs/event-page.c:1333
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "Počáteční čas je chybný"
 
-#: ../calendar/gui/dialogs/event-page.c:1340
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "Konečný čas je chybný"
 
-#: ../calendar/gui/dialogs/event-page.c:1502
-#: ../calendar/gui/dialogs/memo-page.c:769
-#: ../calendar/gui/dialogs/task-page.c:947
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "Vybraný organizátor už nemá účet."
 
-#: ../calendar/gui/dialogs/event-page.c:1508
-#: ../calendar/gui/dialogs/memo-page.c:775
-#: ../calendar/gui/dialogs/task-page.c:953
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Je požadován organizátor."
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/task-page.c:977
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Je požadován alespoň jeden účastník."
 
-#: ../calendar/gui/dialogs/event-page.c:1965
-#: ../calendar/gui/dialogs/task-page.c:1262
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "Př_idat "
 
-#: ../calendar/gui/dialogs/event-page.c:2708
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nemohu otevřít kalendář '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2752
-#: ../calendar/gui/dialogs/memo-page.c:985
-#: ../calendar/gui/dialogs/task-page.c:1923
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Jednáte v zastoupení %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3050
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6260,7 +6689,7 @@ msgstr[0] "%d den před událostí"
 msgstr[1] "%d dny před událostí"
 msgstr[2] "%d dnů před událostí"
 
-#: ../calendar/gui/dialogs/event-page.c:3056
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6268,7 +6697,7 @@ msgstr[0] "%d hodinu před událostí"
 msgstr[1] "%d hodiny před událostí"
 msgstr[2] "%d hodin před událostí"
 
-#: ../calendar/gui/dialogs/event-page.c:3062
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6276,22 +6705,22 @@ msgstr[0] "%d minutu před událostí"
 msgstr[1] "%d minuty před událostí"
 msgstr[2] "%d minut před událostí"
 
-#: ../calendar/gui/dialogs/event-page.c:3075
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "Přizpůsobit"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3080
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:939
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:943
 #: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
 #: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2020
+#: ../plugins/itip-formatter/itip-formatter.c:2022
 #: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
 #: ../widgets/misc/e-dateedit.c:1731
 #: ../widgets/misc/e-signature-combo-box.c:69
@@ -6366,25 +6795,21 @@ msgstr "_Změnit organizátora"
 msgid "Co_ntacts..."
 msgstr "Ko_ntakty..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Organizátor"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organizátor:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2448
 msgid "Memo"
 msgstr "Poznámka"
 
-#: ../calendar/gui/dialogs/memo-page.c:947
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Nemohu otevřít poznámky v '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1131 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
@@ -6405,7 +6830,7 @@ msgid "_Description:"
 msgstr "_Popis:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Skupina:"
@@ -6446,18 +6871,18 @@ msgstr "Tuto a budoucí instance"
 msgid "All Instances"
 msgstr "Všechny instance"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:495
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Tato událost obsahuje taková opakování, která Evolution nemůže editovat."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:816
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "Datum opakování je neplatné"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "zapnuto"
 
@@ -6465,7 +6890,7 @@ msgstr "zapnuto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "1."
 
@@ -6474,7 +6899,7 @@ msgstr "1."
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:999
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "2."
 
@@ -6482,7 +6907,7 @@ msgstr "2."
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1004
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "3."
 
@@ -6490,7 +6915,7 @@ msgstr "3."
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "4."
 
@@ -6498,13 +6923,13 @@ msgstr "4."
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "poslední"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Další data"
 
@@ -6512,7 +6937,7 @@ msgstr "Další data"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1. až 10."
 
@@ -6520,7 +6945,7 @@ msgstr "1. až 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1054
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11. až 20."
 
@@ -6528,45 +6953,45 @@ msgstr "11. až 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "21. až 31."
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "den"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "_"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "opakování"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Přidat výjimku"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Nemohu získat výběr k modifikaci."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Změnit výjimku"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Nemohu získat výběr k vymazání."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Datum/čas"
 
@@ -6617,12 +7042,12 @@ msgstr "týdnů"
 msgid "year(s)"
 msgstr "let"
 
-#: ../calendar/gui/dialogs/task-details-page.c:409
-#: ../calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "Čas dokončení je chybný"
 
-#: ../calendar/gui/dialogs/task-details-page.c:514
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "WWW stránka"
 
@@ -6637,51 +7062,55 @@ msgstr "<span weight=\"bold\">Stav</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:634 ../calendar/gui/e-itip-control.c:946
 #: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/print.c:2520 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "Dokončeno"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:271
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:559 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Vysoká"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:633 ../calendar/gui/print.c:2517
 msgid "In Progress"
 msgstr "Probíhá"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:275
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1061
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:561 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Nízká"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:273
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1062
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:560
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normální"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:632 ../calendar/gui/print.c:2514
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Nezačato"
 
@@ -6694,7 +7123,7 @@ msgid "Stat_us:"
 msgstr "_Stav:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:562 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Nedefinováno"
 
@@ -6711,25 +7140,39 @@ msgstr "_Naléhavost:"
 msgid "_Web Page:"
 msgstr "_WWW stránka:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "Podrobno_sti o úkolu"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+#, fuzzy
+msgid "Click to change or view the status details of the task"
+msgstr "Kliknutím změníte / zobrazíte stav úkolu"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "Možno_sti odesílání"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/tasks-component.c:1326
 msgid "_Task"
 msgstr "Ú_kol"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Podrobnosti úkolů"
 
-#: ../calendar/gui/dialogs/task-page.c:454
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zátor:"
 
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "Datum splnění je chybné"
 
-#: ../calendar/gui/dialogs/task-page.c:1880
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nemohu otevřít úkoly v '%s'."
@@ -6832,75 +7275,59 @@ msgstr "%s při %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s pro neznámý typ spouštění"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3329
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknutím sem otevřete %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:134
-#: ../calendar/gui/e-cal-component-preview.c:176 ../filter/filter-rule.c:852
-#: ../shell/e-shell-folder-title-bar.c:586
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:856
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:186
-#: ../calendar/gui/e-cal-component-preview.c:216
-#: ../calendar/gui/e-cal-component-preview.c:227
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
 msgstr "Datum začátku:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
 #: ../calendar/gui/e-itip-control.c:1218
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Popis:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:235
-#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "WWW stránka:"
 
-#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:210
 #: ../calendar/gui/e-itip-control.c:1162
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Shrnutí"
 
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Termín dokončení:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:246
 #: ../calendar/gui/e-itip-control.c:1186
 #: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1027
 msgid "Status:"
 msgstr "Stav:"
 
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Naléhavost:"
 
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Veřejné"
-
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Soukromé"
-
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Důvěrné"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Konečné datum"
@@ -6910,20 +7337,13 @@ msgstr "Konečné datum"
 msgid "Start Date"
 msgstr "Začátek"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:361
-msgid "Summary"
-msgstr "Přehled"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "Free"
 msgstr "Volný"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:612
 #: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Obsazený"
@@ -6963,9 +7383,9 @@ msgstr "Ne"
 #: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:969
 #: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2045
+#: ../plugins/itip-formatter/itip-formatter.c:2047
 #: ../plugins/plugin-manager/plugin-manager.c:73
-#: ../widgets/misc/e-attachment-bar.c:852
+#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "Neznámá"
@@ -6991,9 +7411,9 @@ msgstr "Zvolte adresář pro uložení vybraných příloh..."
 msgid "untitled_image.%s"
 msgstr "nepojmenovany_obrazek.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1367
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1568
 #: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "_Uložit jako..."
 
@@ -7011,126 +7431,155 @@ msgstr "_Uložit vybrané"
 msgid "Open in %s..."
 msgstr "Otevřít v %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:330
+#, fuzzy
+msgid "* No Summary *"
+msgstr "Není shrnutí"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organizátor: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:369
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organizátor: %s"
+
+#: ../calendar/gui/e-calendar-table.c:400
+#, fuzzy
+msgid "Start: "
+msgstr "Začátek"
+
+#: ../calendar/gui/e-calendar-table.c:412
+#, fuzzy
+msgid "Due: "
+msgstr "Termín dokončení "
+
+#: ../calendar/gui/e-calendar-table.c:581
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:582
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:583
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:584
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:585
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:586
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:587
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:588
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
+#: ../calendar/gui/e-calendar-table.c:871
 #: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Odstraňuji vybrané objekty"
 
-#: ../calendar/gui/e-calendar-table.c:954
+#: ../calendar/gui/e-calendar-table.c:1155
 #: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Aktualizuji objekty"
 
-#: ../calendar/gui/e-calendar-table.c:1139
+#: ../calendar/gui/e-calendar-table.c:1340
 #: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "Uložit jako..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
+#: ../calendar/gui/e-calendar-table.c:1563
 #: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "Nový ú_kol"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1567 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Otevřít _WWW stránku"
 
-#: ../calendar/gui/e-calendar-table.c:1368
+#: ../calendar/gui/e-calendar-table.c:1569
 #: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "_Tisknout..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
+#: ../calendar/gui/e-calendar-table.c:1573
 #: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Vyjmout"
 
-#: ../calendar/gui/e-calendar-table.c:1374
+#: ../calendar/gui/e-calendar-table.c:1575
 #: ../calendar/gui/e-calendar-view.c:1669
 #: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "V_ložit"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1579 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "Př_edat úkol"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1580 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Odeslat jako iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1581
 msgid "_Mark as Complete"
 msgstr "Označit jako _dokončené"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1582
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Označit _vybrané úkoly jako dokončené"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1583
 msgid "_Mark as Incomplete"
 msgstr "Označit jako _nedokončené"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1584
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "Označit _vybrané úkoly jako nedokončené"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Delete Selected Tasks"
 msgstr "_Odstranit vybrané úkoly"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1826
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Úkol přidáte kliknutím zde"
@@ -7153,6 +7602,7 @@ msgid "Due date"
 msgstr "Termín dokončení"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/tasktypes.xml.h:37
 #: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "Naléhavost"
@@ -7161,13 +7611,6 @@ msgstr "Naléhavost"
 msgid "Start date"
 msgstr "Začátek"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:545
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Stav"
-
 #: ../calendar/gui/e-calendar-view.c:1349
 msgid "Moving items"
 msgstr "Přesunuji položky"
@@ -7229,7 +7672,7 @@ msgstr "_Odeslat jako iCalendar..."
 msgid "_Reply"
 msgstr "_Odpovědět"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1336
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
 #: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
@@ -7247,26 +7690,14 @@ msgstr "Odstranit tento vý_skyt"
 msgid "Delete _All Occurrences"
 msgstr "Odstranit _všechny výskyty"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2227
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organizátor: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2231
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organizátor: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2247 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2477
 #, c-format
 msgid "Location: %s"
 msgstr "Místo: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2281
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "Datum: %s %s"
@@ -7442,12 +7873,12 @@ msgstr ""
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2033
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "Akceptováno"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2036
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "Předběžně akceptováno"
 
@@ -7455,7 +7886,7 @@ msgstr "Předběžně akceptováno"
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
 #: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2039
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "Zamítnuto"
 
@@ -7832,7 +8263,7 @@ msgstr "Předběžné"
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
 #: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2042
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "Delegováno"
 
@@ -7937,10 +8368,6 @@ msgstr "_Začátek:"
 msgid "_End time:"
 msgstr "_Konec:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Účastník"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Účastníka přidáte kliknutím zde"
@@ -8174,11 +8601,11 @@ msgstr "Informace iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Musíte být účastníkem události."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:465
 msgid "_New Memo List"
 msgstr "_Nový seznam poznámek"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:545
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8186,7 +8613,7 @@ msgstr[0] "%d poznámka"
 msgstr[1] "%d poznámky"
 msgstr[2] "%d poznámek"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8194,56 +8621,56 @@ msgstr[0] ", %d vybráno"
 msgstr[1] ", %d vybrány"
 msgstr[2] ", %d vybráno"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:594
 msgid "Failed upgrading memos."
 msgstr "Nemohu aktualizovat poznámky."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:954
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "Nemohu otevřít seznam poznámek '%s' pro tvorbu událostí a schůzek"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:967
 msgid "There is no calendar available for creating memos"
 msgstr "Není k dispozici kalendář pro tvorbu poznámek"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1077
 msgid "Memo Source Selector"
 msgstr "Výběr zdroje poznámky"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Nová poznámka"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
 msgid "Mem_o"
 msgstr "_Poznámka"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Vytvořit novou poznámku"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Nová sdílená poznámka"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
 msgid "_Shared memo"
 msgstr "_Sdílená poznámka"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Vytvořit novou sdílenou poznámku"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Nový seznam poznámek"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
 msgid "Memo li_st"
 msgstr "Sez_nam poznámek"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Vytvořit nový seznam poznámek"
 
@@ -8251,6 +8678,11 @@ msgstr "Vytvořit nový seznam poznámek"
 msgid "Print Memos"
 msgstr "Tisknout poznámky"
 
+#: ../calendar/gui/memotypes.xml.h:25
+#, fuzzy
+msgid "Next 7 Days'"
+msgstr "Úkoly v příštích 7 dnech"
+
 #: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8503,11 +8935,11 @@ msgstr "Kontakty: "
 msgid "Upcoming Appointments"
 msgstr "Nadcházející události"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:456
 msgid "_New Task List"
 msgstr "_Nový seznam úkolů"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:536
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8515,52 +8947,52 @@ msgstr[0] "%d úkol"
 msgstr[1] "%d úkoly"
 msgstr[2] "%d úkolů"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:585
 msgid "Failed upgrading tasks."
 msgstr "Nemohu aktualizovat úkoly."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:942
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Nemohu otevřít seznam úkolů '%s' pro tvorbu událostí a schůzek"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:955
 msgid "There is no calendar available for creating tasks"
 msgstr "Není k dispozici kalendář pro tvorbu úkolů"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1066
 msgid "Task Source Selector"
 msgstr "Výběr zdroje úkolu"
 
-#: ../calendar/gui/tasks-component.c:1324
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Nový úkol"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Vytvořit nový úkol"
 
-#: ../calendar/gui/tasks-component.c:1332
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Nový přidělený úkol"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1334
 msgid "Assigne_d Task"
 msgstr "_Přidělený úkol"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Vytvořit nový přidělený úkol"
 
-#: ../calendar/gui/tasks-component.c:1340
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Nový seznam úkolů"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1342
 msgid "Tas_k list"
 msgstr "Seznam ú_kolů"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Vytvořit nový seznam úkolů"
 
@@ -8576,7 +9008,7 @@ msgstr ""
 "\n"
 "Opravdu odstranit tyto úkoly?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "Příště se neptat."
 
@@ -8584,6 +9016,29 @@ msgstr "Příště se neptat."
 msgid "Print Tasks"
 msgstr "Tisknout úkoly"
 
+#: ../calendar/gui/tasktypes.xml.h:2
+#, fuzzy, no-c-format
+msgid "% Completed"
+msgstr "% hotovo"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+#, fuzzy
+msgid "Cancelled"
+msgstr "Zrušeno"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+#, fuzzy
+msgid "In progress"
+msgstr "Probíhá"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "je více než"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "je méně než"
+
 #: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Události a schůzky"
@@ -10161,204 +10616,202 @@ msgstr "Nemohu otevřít soubor"
 msgid "Unable to retrieve message from editor"
 msgstr "Nemohu získat z editoru"
 
-#: ../composer/e-composer-actions.c:46
+#: ../composer/e-composer-actions.c:47
 msgid "Insert Attachment"
 msgstr "Vložit přílohu"
 
-#: ../composer/e-composer-actions.c:50
+#: ../composer/e-composer-actions.c:51
 msgid "A_ttach"
 msgstr "_Přiložit"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:143
 msgid "Untitled Message"
 msgstr "Nepojmenovaná zpráva"
 
-#: ../composer/e-composer-actions.c:464 ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "_Přílohu..."
-
-#: ../composer/e-composer-actions.c:466
+#: ../composer/e-composer-actions.c:474
 msgid "Attach a file"
 msgstr "Připojit soubor"
 
-#: ../composer/e-composer-actions.c:471 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:481
 msgid "Close the current file"
 msgstr "Uzavřít aktuální soubor"
 
-#: ../composer/e-composer-actions.c:478 ../mail/em-folder-view.c:1343
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Tisknout..."
 
-#: ../composer/e-composer-actions.c:485 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
 #: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_Náhled před tiskem"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:502
 msgid "Save the current file"
 msgstr "Uložit aktuální soubor"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:507
 msgid "Save _As..."
 msgstr "Uložit _jako..."
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:509
 msgid "Save the current file with a different name"
 msgstr "Uložit aktuální soubor pod jiným jménem"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:514
 msgid "Save _Draft"
 msgstr "Uložit _koncept"
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:516
 msgid "Save as draft"
 msgstr "Uložit jako koncept"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:521
 msgid "S_end"
 msgstr "P_oslat"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:523
 msgid "Send this message"
 msgstr "Poslat tuto zprávu"
 
-#: ../composer/e-composer-actions.c:520 ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "Možno_sti odesílání"
-
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:530
 msgid "Insert Send options"
 msgstr "Vložit možnosti odesílání"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:535
+#, fuzzy
+msgid "New _Message"
+msgstr "_Zpráva"
+
+#: ../composer/e-composer-actions.c:537
+#, fuzzy
+msgid "Open New Message window"
+msgstr "_Odeslat novou zprávu..."
+
+#: ../composer/e-composer-actions.c:544
 #, fuzzy
 msgid "Character _Encoding"
 msgstr "Kódování znaků"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:551
 msgid "_Security"
 msgstr "_Zabezpečení"
 
-#: ../composer/e-composer-actions.c:546
+#: ../composer/e-composer-actions.c:561
 msgid "PGP _Encrypt"
 msgstr "Ši_frování PGP"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:563
 msgid "Encrypt this message with PGP"
 msgstr "Zašifrovat tuto zprávu pomocí PGP"
 
-#: ../composer/e-composer-actions.c:554
+#: ../composer/e-composer-actions.c:569
 msgid "PGP _Sign"
 msgstr "Pod_pis PGP"
 
-#: ../composer/e-composer-actions.c:556
+#: ../composer/e-composer-actions.c:571
 msgid "Sign this message with your PGP key"
 msgstr "Podepsat tuto zprávu vaším klíčem PGP"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:577
 msgid "_Prioritize Message"
 msgstr "_Důležitost zprávy"
 
-#: ../composer/e-composer-actions.c:564
+#: ../composer/e-composer-actions.c:579
 msgid "Set the message priority to high"
 msgstr "Nastavit vysokou prioritu zprávy"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:585
 #, fuzzy
 msgid "Re_quest Read Receipt"
 msgstr "Žáda_t o doručenku o čtení"
 
-#: ../composer/e-composer-actions.c:572
+#: ../composer/e-composer-actions.c:587
 msgid "Get delivery notification when your message is read"
 msgstr "Doručit oznámení, že vaše zpráva byla přečtena"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:593
 msgid "S/MIME En_crypt"
 msgstr "Šif_rování S/MIME"
 
-#: ../composer/e-composer-actions.c:580
+#: ../composer/e-composer-actions.c:595
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Zašifrovat tuto zprávu vaším šifrovacím certifikátem S/MIME"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:601
 msgid "S/MIME Sig_n"
 msgstr "Po_dpis S/MIME"
 
-#: ../composer/e-composer-actions.c:588
+#: ../composer/e-composer-actions.c:603
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Podepsat tuto zprávu podpisovým certifikátem S/MIME"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:609
 msgid "_Bcc Field"
 msgstr "_Skrytá kopie:"
 
-#: ../composer/e-composer-actions.c:596
+#: ../composer/e-composer-actions.c:611
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Přepne zobrazení pole BCC"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:617
 msgid "_Cc Field"
 msgstr "_Kopie"
 
-#: ../composer/e-composer-actions.c:604
+#: ../composer/e-composer-actions.c:619
 msgid "Toggles whether the CC field is displayed"
 msgstr "Přepne zobrazení pole CC"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:625
 msgid "_From Field"
 msgstr "_Od:"
 
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:627
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Přepne zobrazení pole pro výběr odesílatele"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:633
 msgid "_Post-To Field"
 msgstr "_Poslat-komu"
 
-#: ../composer/e-composer-actions.c:620
+#: ../composer/e-composer-actions.c:635
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Přepne zobrazení pole Poslat-komu"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:641
 msgid "_Reply-To Field"
 msgstr "Odpovědět-_komu:"
 
-#: ../composer/e-composer-actions.c:628
+#: ../composer/e-composer-actions.c:643
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Přepne zobrazení pole Odpověď-kam"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:649
 #, fuzzy
 msgid "_Subject Field"
 msgstr "_Kopie"
 
-#: ../composer/e-composer-actions.c:636
+#: ../composer/e-composer-actions.c:651
 #, fuzzy
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Přepne zobrazení pole stavu"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:657
 msgid "_To Field"
 msgstr "_Komu"
 
-#: ../composer/e-composer-actions.c:644
+#: ../composer/e-composer-actions.c:659
 msgid "Toggles whether the To field is displayed"
 msgstr "Přepne zobrazení pole Komu"
 
-#: ../composer/e-composer-actions.c:685 ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "Příloha"
-
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Vyplnit příjemce zprávy"
@@ -10624,7 +11077,7 @@ msgstr "_Uložit zprávu"
 msgid "Evolution Mail and Calendar"
 msgstr "Pošta a Kalendář Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Sada groupware"
 
@@ -10683,15 +11136,15 @@ msgstr "Povoleno"
 msgid "Whether the plugin is enabled"
 msgstr "Jestli je rozbalovač rozbalen"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "Během tisku se vyskytla chyba"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "Tiskový systém nahlásil následující detaily o chybě:"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:171
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "Tiskový systém nenahlásil žádné další detaily o chybě."
@@ -10924,56 +11377,56 @@ msgstr "Vybrat soubor"
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:847
+#: ../filter/filter-rule.c:851
 msgid "R_ule name:"
 msgstr "Ná_zev pravidla:"
 
-#: ../filter/filter-rule.c:875
+#: ../filter/filter-rule.c:879
 msgid "Find items that meet the following criteria"
 msgstr "Hledat položky s následujícími kritérii"
 
-#: ../filter/filter-rule.c:909
+#: ../filter/filter-rule.c:913
 msgid "A_dd Filter Criteria"
 msgstr "_Přidat pravidlo filtru"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:919
 msgid "If all criteria are met"
 msgstr "Pokud souhlasí všechna kritéria"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:919
 msgid "If any criteria are met"
 msgstr "Pokud souhlasí některá kritéria"
 
-#: ../filter/filter-rule.c:917
+#: ../filter/filter-rule.c:921
 msgid "_Find items:"
 msgstr "_Najít položky:"
 
-#: ../filter/filter-rule.c:939
+#: ../filter/filter-rule.c:943
 msgid "All related"
 msgstr "Vše související"
 
-#: ../filter/filter-rule.c:939
+#: ../filter/filter-rule.c:943
 msgid "Replies"
 msgstr "Odpovědi"
 
-#: ../filter/filter-rule.c:939
+#: ../filter/filter-rule.c:943
 msgid "Replies and parents"
 msgstr "Odpovědi a rodiče"
 
-#: ../filter/filter-rule.c:939
+#: ../filter/filter-rule.c:943
 msgid "No reply or parent"
 msgstr "Bez odpovědi nebo rodič"
 
-#: ../filter/filter-rule.c:941
+#: ../filter/filter-rule.c:945
 msgid "I_nclude threads"
 msgstr "Z_ahrnout vlákna"
 
-#: ../filter/filter-rule.c:1039 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1043 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Příchozí"
 
-#: ../filter/filter-rule.c:1039 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1043 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Odchozí"
 
@@ -11087,7 +11540,7 @@ msgstr "s časem, který určíte"
 
 #: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:399
+#: ../plugins/google-account-setup/google-source.c:404
 msgid "weeks"
 msgstr "týdnů"
 
@@ -11158,10 +11611,10 @@ msgstr "Ovládací prvek nastavení pošty Evolution"
 msgid "Evolution Network configuration control"
 msgstr "Ovládací prvek nastavení kalendáře Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:611
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
-#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
-#: ../mail/mail-component.c:757
+#: ../mail/mail-component.c:593 ../mail/mail-component.c:594
+#: ../mail/mail-component.c:758
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Pošta"
@@ -11294,18 +11747,18 @@ msgstr "Přidat skript podpisu"
 msgid "Signature(s)"
 msgstr "Podpisy"
 
-#: ../mail/em-composer-utils.c:1008 ../mail/em-format-quote.c:413
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Přeposlaná zpráva --------"
 
-#: ../mail/em-composer-utils.c:1820
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "neznámý odesílatel"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1867
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11313,7 +11766,7 @@ msgstr ""
 "${Sender} píše v ${AbbrevWeekdayName} ${Day}. ${Month}. ${Year} v ${24Hour}:"
 "${Minute} ${TimeZone}:"
 
-#: ../mail/em-composer-utils.c:2010
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-------- Původní zpráva --------"
 
@@ -11334,10 +11787,6 @@ msgstr "Přiřadit barvu"
 msgid "Assign Score"
 msgstr "Přiřadit skóre"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Přílohy"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "Skrytá kopie"
@@ -11354,10 +11803,6 @@ msgstr "Kopie"
 msgid "Completed On"
 msgstr "Dokončeno"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "obsahuje"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopírovat do složky"
@@ -11382,10 +11827,6 @@ msgstr "Odstranit"
 msgid "Deleted"
 msgstr "Odstraněno"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "neobsahuje"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "nekončí na"
@@ -11406,10 +11847,6 @@ msgstr "nezní jako"
 msgid "does not start with"
 msgstr "nezačíná na"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Neexistují"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Koncept"
@@ -11418,10 +11855,6 @@ msgstr "Koncept"
 msgid "ends with"
 msgstr "končí na"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Existují"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "existuje"
@@ -11434,14 +11867,10 @@ msgstr "Výraz"
 msgid "Follow Up"
 msgstr "K vyřízení"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1053
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Důležité"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "je"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "je po"
@@ -11454,18 +11883,6 @@ msgstr "je před"
 msgid "is Flagged"
 msgstr "je označený"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "je více než"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "je méně než"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "není"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "není označený"
@@ -11662,11 +12079,11 @@ msgstr "Důležité zprávy"
 msgid "Messages Not Junk"
 msgstr "Zprávy nejsou nevyžádané"
 
-#: ../mail/em-folder-browser.c:1147
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "Vyhledávání účtu"
 
-#: ../mail/em-folder-browser.c:1200
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "Vyhledávání všech účtů"
 
@@ -11778,12 +12195,12 @@ msgstr "Přesouvám složku %s"
 msgid "Copying folder %s"
 msgstr "Kopíruji složku %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1954
+#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Přesouvám zprávy do složky %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1956
+#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopíruji zprávy do složky %s"
@@ -11805,13 +12222,6 @@ msgstr "_Přesunout do složky"
 msgid "Scanning folders in \"%s\""
 msgstr "Procházím složky v \"%s\""
 
-#: ../mail/em-folder-tree.c:2082 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Zobrazit"
-
 #: ../mail/em-folder-tree.c:2083
 msgid "Open in _New Window"
 msgstr "Otevřít v _novém okně"
@@ -11846,13 +12256,13 @@ msgstr "Vyprázdnit _koš"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopíruji `%s' do `%s'"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Vyberte složku"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
 msgid "C_opy"
 msgstr "_Kopírovat"
 
@@ -11874,168 +12284,168 @@ msgstr "Vytvořit složku"
 msgid "Specify where to create the folder:"
 msgstr "Upřesněte, kde chcete vytvořit složku:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Selhalo mazání pošty"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Nemáte dostatečná oprávnění pro smazání této pošty."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "_Odpovědět odesílateli"
 
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:569 ../mail/em-popup.c:580
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Přeposlat"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Upravit jako novou zprávu..."
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1348
 msgid "U_ndelete"
 msgstr "Obnovit _odstraněné"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1349
 msgid "_Move to Folder..."
 msgstr "Pře_sunout do složky..."
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1350
 msgid "_Copy to Folder..."
 msgstr "_Kopírovat do složky..."
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1353
 msgid "Mar_k as Read"
 msgstr "Označit jako _přečtené"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Unread"
 msgstr "Označit jako _nepřečtené"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Important"
 msgstr "Označit jako _důležité"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as Un_important"
 msgstr "Označit jako nedůlež_ité"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Junk"
 msgstr "Označit jako _nevyžádaná"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as _Not Junk"
 msgstr "Označit že není _nevyžádaná"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1359
 msgid "Mark for Follo_w Up..."
 msgstr "Označit k _vyřízení..."
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1361
 msgid "_Label"
 msgstr "Š_títek"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "Žá_dný"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1365
 msgid "_New Label"
 msgstr "_Nový štítek"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1369
 msgid "Fla_g Completed"
 msgstr "Označit jako _dokončeno"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1370
 msgid "Cl_ear Flag"
 msgstr "Zrušit _značku"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1373
 msgid "Crea_te Rule From Message"
 msgstr "Vy_tvořit pravidlo ze zprávy"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1375
 msgid "Search Folder based on _Subject"
 msgstr "Složka hledání podle _předmětu"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1376
 msgid "Search Folder based on Se_nder"
 msgstr "Složka hledání podle _odesílatele"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1377
 msgid "Search Folder based on _Recipients"
 msgstr "Složka hledání podle příje_mců"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1378
 msgid "Search Folder based on Mailing _List"
 msgstr "Složka hledání podle poštovní _konference"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1383
 msgid "Filter based on Sub_ject"
 msgstr "Filtr podle _předmětu"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1384
 msgid "Filter based on Sen_der"
 msgstr "Filtr podle _odesílatele"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1385
 msgid "Filter based on Re_cipients"
 msgstr "Filtr podle příje_mců"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1386
 msgid "Filter based on _Mailing List"
 msgstr "Filtr podle poštovní _konference"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2268 ../mail/em-folder-view.c:2312
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
 msgid "Default"
 msgstr "Implicitní"
 
-#: ../mail/em-folder-view.c:2530
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "Nemohu získat zprávu"
 
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "Získávám zprávu..."
 
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "_Volat..."
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
 msgstr "Vytvořit složku _hledání"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "_Z této adresy"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "_Na tuto adresu"
 
-#: ../mail/em-folder-view.c:3310
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknutím sem pošlete e-mail %s"
 
-#: ../mail/em-folder-view.c:3322
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknutím zavoláte %s"
 
-#: ../mail/em-folder-view.c:3327
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "Skrýt/odkrýt adresy"
 
@@ -12322,7 +12732,7 @@ msgid "Bcc"
 msgstr "Skrytá kopie"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:350
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Program elektronické pošty"
@@ -12371,43 +12781,43 @@ msgstr "Diskusní skupiny"
 msgid "%s attachment"
 msgstr "%s příloha"
 
-#: ../mail/em-format.c:1197
+#: ../mail/em-format.c:1198
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Nemohu zpracovat zprávu S/MIME: Neznámá chyba"
 
-#: ../mail/em-format.c:1334 ../mail/em-format.c:1490
+#: ../mail/em-format.c:1335 ../mail/em-format.c:1491
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nemohu zpracovat zprávu MIME. Zobrazím ji jako zdrojový kód."
 
-#: ../mail/em-format.c:1342
+#: ../mail/em-format.c:1343
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nepodporovaný typ šifrování pro multipart/encrypted"
 
-#: ../mail/em-format.c:1352
+#: ../mail/em-format.c:1353
 msgid "Could not parse PGP/MIME message"
 msgstr "Nemohu zpracovat zprávu PGP/MIME"
 
-#: ../mail/em-format.c:1352
+#: ../mail/em-format.c:1353
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Nemohu zpracovat zprávu PGP/MIME: Neznámá chyba"
 
-#: ../mail/em-format.c:1509
+#: ../mail/em-format.c:1510
 msgid "Unsupported signature format"
 msgstr "Nepodporovaný formát podpisu"
 
-#: ../mail/em-format.c:1517 ../mail/em-format.c:1588
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1589
 msgid "Error verifying signature"
 msgstr "Chyba při ověřování podpisu"
 
-#: ../mail/em-format.c:1517 ../mail/em-format.c:1579 ../mail/em-format.c:1588
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1580 ../mail/em-format.c:1589
 msgid "Unknown error verifying signature"
 msgstr "Neznámá chyba při ověřování podpisu"
 
-#: ../mail/em-format.c:1660
+#: ../mail/em-format.c:1661
 msgid "Could not parse PGP message"
 msgstr "Nemohu zpracovat zprávu PGP"
 
-#: ../mail/em-format.c:1660
+#: ../mail/em-format.c:1661
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Nemohu zpracovat zprávu PGP: Neznámá chyba"
 
@@ -12471,68 +12881,86 @@ msgid "No Junk plugin available"
 msgstr "Žádný zásuvný modul pro nevyžádanou poštu není dostupný"
 
 #. green
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Udělat"
 
 #. blue
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Později"
 
-#: ../mail/em-migrate.c:1210
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Umístění a hierarchie složek poštovních schránek Evolution se od Evolution 1."
-"x změnilo.\n"
-"\n"
-"Počkejte prosím, než Evolution převede vaše složky..."
+#: ../mail/em-migrate.c:1247
+#, fuzzy, c-format
+msgid "Migrating '%s':"
+msgstr "Převádím `%s':"
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Nemohu vytvořit novou složku `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Nemohu kopírovat složku `%s' do `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Nemohu hledat existující poštovní schránky v `%s': %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:1868
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Umístění a hierarchie složek poštovních schránek Evolution se od Evolution 1."
+"x změnilo.\n"
+"\n"
+"Počkejte prosím, než Evolution převede vaše složky..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Nemohu se otevřít stará data o ponechávání na serveru POP `%s': %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Nemohu vytvořit adresář dat o ponechávání na serveru POP3 `%s': %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Nemohu zkopírovat data POP3 ponechávaná na serveru `%s': %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Nemohu vytvořit místní úložiště pošty `%s': %s"
 
-#: ../mail/em-migrate.c:2851
+#: ../mail/em-migrate.c:2898
+#, fuzzy
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Umístění a hierarchie složek poštovních schránek Evolution se od Evolution 1."
+"x změnilo.\n"
+"\n"
+"Počkejte prosím, než Evolution převede vaše složky..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Nemohu vytvořit místní složky pošty v `%s': %s"
 
-#: ../mail/em-migrate.c:2870
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -13557,7 +13985,14 @@ msgstr "%s konferencí"
 msgid "Add Filter Rule"
 msgstr "Přidat pravidlo filtru"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#, fuzzy
+msgid "Templates"
+msgstr "Šablona:"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -13565,7 +14000,7 @@ msgstr[0] "%d vybráno, "
 msgstr[1] "%d vybrány, "
 msgstr[2] "%d vybráno, "
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -13573,7 +14008,7 @@ msgstr[0] "%d odstraněna"
 msgstr[1] "%d odstraněny"
 msgstr[2] "%d odstraněno"
 
-#: ../mail/mail-component.c:558
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -13581,7 +14016,7 @@ msgstr[0] "%d nevyžádaná pošta"
 msgstr[1] "%d nevyžádaný pošty"
 msgstr[2] "%d nevyžádaných pošt"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -13589,7 +14024,7 @@ msgstr[0] "%d koncept"
 msgstr[1] "%d koncepty"
 msgstr[2] "%d konceptů"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -13597,7 +14032,7 @@ msgstr[0] "%d odeslána"
 msgstr[1] "%d odeslány"
 msgstr[2] "%d odesláno"
 
-#: ../mail/mail-component.c:565
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -13605,7 +14040,7 @@ msgstr[0] "%d neodeslána"
 msgstr[1] "%d neodeslány"
 msgstr[2] "%d neodesláno"
 
-#: ../mail/mail-component.c:571
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -13613,7 +14048,7 @@ msgstr[0] "%d nepřečtena, "
 msgstr[1] "%d nepřečteny, "
 msgstr[2] "%d nepřečteno, "
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -13621,87 +14056,87 @@ msgstr[0] "%d celkem"
 msgstr[1] "%d celkem"
 msgstr[2] "%d celkem"
 
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:914
 msgid "New Mail Message"
 msgstr "Nová zpráva"
 
-#: ../mail/mail-component.c:914
+#: ../mail/mail-component.c:915
 msgid "_Mail Message"
 msgstr "_Zpráva"
 
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:916
 msgid "Compose a new mail message"
 msgstr "Napsat novou zprávu"
 
-#: ../mail/mail-component.c:921
+#: ../mail/mail-component.c:922
 msgid "New Mail Folder"
 msgstr "Nová složka pošty"
 
-#: ../mail/mail-component.c:922
+#: ../mail/mail-component.c:923
 msgid "Mail _Folder"
 msgstr "_Složka pošty"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:924
 msgid "Create a new mail folder"
 msgstr "Vytvořit novou složku pošty"
 
-#: ../mail/mail-component.c:1070
+#: ../mail/mail-component.c:1071
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Nemohu aktualizovat nastavení nebo složky pošty."
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1584
 msgid "Error"
 msgstr "Chyba"
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1584
 msgid "Errors"
 msgstr "Chyby"
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1585
 msgid "Warnings and Errors"
 msgstr "Varování a chyby"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1586
 msgid "Debug"
 msgstr "Ladění"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1586
 msgid "Error, Warnings and Debug messages"
 msgstr "Chybé, varující a ladicí zprávy"
 
-#: ../mail/mail-component.c:1712
+#: ../mail/mail-component.c:1713
 msgid "Debug Logs"
 msgstr "Ladicí protokol"
 
-#: ../mail/mail-component.c:1726
+#: ../mail/mail-component.c:1727
 msgid "Show _errors in the status bar for"
 msgstr "_Zobrazit chyby ve stavovém řádku"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1742
+#: ../mail/mail-component.c:1743
 #, fuzzy
 msgid "second(s)."
 msgstr "sekundách."
 
-#: ../mail/mail-component.c:1748
+#: ../mail/mail-component.c:1749
 msgid "Log Messages:"
 msgstr "Zprávy protokolu:"
 
-#: ../mail/mail-component.c:1789
+#: ../mail/mail-component.c:1790
 msgid "Log Level"
 msgstr "Úroveň protokolování"
 
-#: ../mail/mail-component.c:1798 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1799 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Čas"
 
-#: ../mail/mail-component.c:1808 ../mail/message-list.c:2388
+#: ../mail/mail-component.c:1809 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Zprávy"
 
-#: ../mail/mail-component.c:1817 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1818 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Zavřít toto okno"
@@ -14291,7 +14726,7 @@ msgid "Use Authe_ntication"
 msgstr "Autentizace"
 
 #: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:359
+#: ../plugins/google-account-setup/google-source.c:364
 msgid "User_name:"
 msgstr "_Jméno uživatele:"
 
@@ -14778,11 +15213,6 @@ msgstr "Uživatel zrušil operaci."
 msgid "_Save and Close"
 msgstr "Uložit a zavřít"
 
-#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Soubor"
-
 #: ../mail/mail-signature-editor.c:355
 #, fuzzy
 msgid "Edit Signature"
@@ -15486,85 +15916,86 @@ msgstr "_Vyčistit"
 msgid "_Open Messages"
 msgstr "_Otevřít zprávy"
 
-#: ../mail/message-list.c:1050
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Nepřečtené"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Přečtené"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Odpovězené"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 #, fuzzy
 msgid "Forwarded"
 msgstr "Přeposlat"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Více nepřečtených zpráv"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Více zpráv"
 
-#: ../mail/message-list.c:1059
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Nejnižší"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Nižší"
 
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Vyšší"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Nejvyšší"
 
-#: ../mail/message-list.c:1594 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1601 ../plugins/itip-formatter/itip-view.c:204
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Dnes %k:%M"
 
-#: ../mail/message-list.c:1610 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %k:%M"
 
-#: ../mail/message-list.c:1622 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:3843
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3885 ../mail/message-list.c:4321
 msgid "Generating message list"
 msgstr "Generuji seznam zpráv"
 
-#: ../mail/message-list.c:4129
+#: ../mail/message-list.c:4176
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 
-#: ../mail/message-list.c:4131
+#: ../mail/message-list.c:4178
 #, fuzzy
 msgid "There are no messages in this folder."
 msgstr ""
@@ -15686,6 +16117,7 @@ msgstr ""
 "těle zprávy."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Klíčová slova"
 
@@ -15771,102 +16203,106 @@ msgstr "Zvolte, který archiv Evolution obnovit:"
 msgid "Choose a file to restore"
 msgstr "Vybrat, který soubor obnovit"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "Zazálohovat adresář Evolution"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "Obnovit adresář Evolution"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "Zkontrolovat zálohu Evolutionu"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "Restartovat Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr "s grafickým uživatelským rozhraním"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "Ukončuji Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "Zálohování účtů a nastavení Evolutionu"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Zálohování dat Evolutionu (pošta, kontakty, kalendář, úlohy, poznámky)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "Zálohování dokončeno"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "Restartování Evolution"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "Zazálohovat aktuální data Evolutionu"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "Rozbalování souborů ze zálohy"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "Načítání nastavení Evolutionu"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "Odstraňuji dočasné soubory zálohy"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Zálohování do složky %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Obnova ze složky %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "Zálohování Evolution"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "Obnova Evolution"
 
-#: ../plugins/backup-restore/backup.c:308
+#: ../plugins/backup-restore/backup.c:494
 #, fuzzy
 msgid "Backing up Evolution Data"
 msgstr "Zazálohovat aktuální data Evolutionu"
 
-#: ../plugins/backup-restore/backup.c:309
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:311
+#: ../plugins/backup-restore/backup.c:497
 #, fuzzy
 msgid "Restoring Evolution Data"
 msgstr "Restartování Evolution"
 
-#: ../plugins/backup-restore/backup.c:312
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:330
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 
@@ -16054,7 +16490,7 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:352
+#: ../plugins/google-account-setup/google-source.c:357
 msgid "Use _SSL"
 msgstr "Použít _SSL"
 
@@ -16076,7 +16512,7 @@ msgstr "Poskytuje základní funkce místních kalendářů."
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:376
+#: ../plugins/google-account-setup/google-source.c:381
 #, fuzzy
 msgid "Re_fresh:"
 msgstr "_Obnovit"
@@ -16220,11 +16656,28 @@ msgid ""
 "default one."
 msgstr "Poskytuje funkce pro označení kalendáře nebo adresáře jako implicitní."
 
-#: ../plugins/email-custom-header/email-custom-header.c:535
+#: ../plugins/email-custom-header/email-custom-header.c:562
 #, fuzzy
 msgid "_Custom Header"
 msgstr "Vlastní hlavičky"
 
+#: ../plugins/email-custom-header/email-custom-header.c:883
+#, fuzzy
+msgid "Key"
+msgstr "Keňa"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr ""
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
 #, fuzzy
 msgid "Email Custom Header"
@@ -16605,7 +17058,7 @@ msgstr "Velikost složky"
 msgid "User"
 msgstr "_Uživatel"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Přihlásit se ke složce jiného uživatele"
@@ -16936,10 +17389,14 @@ msgid "Could not update out-of-office state"
 msgstr "Nemohu aktualizovat stav \"mimo kancelář\""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "Účet Exchange je off-line."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16966,105 +17423,105 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Nemohu aktualizovat delegáty:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Složka již existuje"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Složka neexistuje"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Složka je off-line"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 #: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "Obecná chyba"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "Server Global Catalog není dostupný"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
 msgstr ""
 "Pokud OWA běží na jiné cestě, musíte ji zadat v dialogu nastavení účtu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "Poštovní schránka pro {0} není na tomto serveru."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "Zkontrolujte, že je URL správné, a zkuste to znovu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "Zkontrolute, že název serveru je zadán správně, a zkuste to znovu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 "Zkontrolute, že jméno uživatele a heslo jsou správné, a zkuste to znovu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "Pro tento účet není nastaven server Global Catalog."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "Pro uživatele {0} není na {1} poštovní schránka."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Uživatel {0} neexistuje"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "Heslo úspěšně změněno."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 "Prosím vložte delegátovo ID a zrušte výběr volby Odeslat jako zplnomocnění."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Prosím ujistěte se, že název serveru Global Catalog je správný."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Aby se změny projevily, prosím restartujte Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Vyberte prosím uživatele."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "Server odmítl heslo, protože je příliš slabé."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Účet Exchange bude zakázán, až ukončíte Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Účet Exchange bude odstraněn, až ukončíte Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Server Exchange není kompatibilní s Exchange Connectorem."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17072,7 +17529,7 @@ msgstr ""
 "Na serveru běží Exchange 5.5. Exchange Connector \n"
 "podporující jen Microsoft Exchange 2000 a 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17086,58 +17543,58 @@ msgstr ""
 "\n"
 "Nebo jste prostě zadali špatné heslo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "Zkuste to znovu s jiným heslem."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "Nemohu přidat uživatele do seznamu řízení přístupu:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Nemohu upravit delegáty."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Neznámá chyba při vyhledávání {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error."
 msgstr "Neznámá chyba."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Neznámý typ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Nepodporovaná operace."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Blížíte se své kvótě pro ukládání pošty na tomto serveru."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr ""
 "Je vám umožněno posílat zprávy pouze jménem jednoho delegujícího zároveň."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "Nemůžete se učinit svým vlastním delegátem"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Překročili jste svou kvótu pro ukládání pošty na tomto serveru."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "Můžete nastavit jen jeden účet Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -17145,14 +17602,14 @@ msgstr ""
 "Momentálně používáte: {0} KB. Zkuste uvolnit trochu místa odstraněním nějaké "
 "pošty."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr ""
 "Momentálně používáte: {0} KB. Teď nebudete moci odesílat ani přijímat poštu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17160,19 +17617,19 @@ msgstr ""
 "Momentálně používáte: {0} KB. Teď nebudete moci odesílat poštu, dokud "
 "neuvolníte trochu místa odstraněním nějaké pošty."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "Platnost vašeho hesla vypršela."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} nelze přidat do seznamu řízení přístupu"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} již je delegát"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} již je na seznamu"
 
@@ -17288,13 +17745,32 @@ msgstr "Odhlásit složky"
 msgid "_Unsubscribe"
 msgstr "_Odhlásit se"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:73
+#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+#, fuzzy
+msgid "<b>Server</b>"
+msgstr "<b>Členové:</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+#, fuzzy
+msgid "Username:"
+msgstr "_Jméno uživatele:"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:230
+#, fuzzy
+msgid "Update every"
+msgstr "Aktualizuji dotaz"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
+#, fuzzy
+msgid "A plugin to setup google calendar and contacts."
 msgstr "Zásuvný modul pro nastavení Google Calendar."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17403,12 +17879,6 @@ msgstr "Stáhnout poštu zpět"
 msgid "Add Send Options to groupwise messages"
 msgstr "Přidat možnosti odesílání ke zprávám groupwise"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Možnosti odesílání"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Zásuvný modul pro funkce účtů GroupWise."
@@ -17992,31 +18462,31 @@ msgstr ""
 "Pro zpracování všech těchto položek by měl být soubor uložen a kalendář "
 "importován"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2147
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "Tato schůzka se opakuje"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2150
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "Tento úkol se opakuje"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2153
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "Tato poznámka se opakuje"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2382
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "_Odstranit zprávu po zpracování"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2392
-#: ../plugins/itip-formatter/itip-formatter.c:2424
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "Hledání konfliktů"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2407
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Zvolte kalendáře, ve kterých hledat konflikty se schůzkou"
 
@@ -18595,12 +19065,22 @@ msgstr "Zda má ikona blikat či ne."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Zdali upozornit pouze na nové zprávy ve složce Příchozí."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "Vytvořit zprávu _D-Bus"
 
+#: ../plugins/mail-notification/mail-notification.c:361
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "Upozornění na novou poštu"
+
+#: ../plugins/mail-notification/mail-notification.c:382
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "Upozornění na novou poštu"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:440
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18609,65 +19089,65 @@ msgid_plural ""
 "You have received %d new messages\n"
 "in %s."
 msgstr[0] ""
-"Dorazila vám %d nová zpráva\n"
-"v %s."
+"Přijata %d nová zpráva\n"
+"ve složce %s."
 msgstr[1] ""
-"Dorazily vám %d nové zprávy\n"
-"v %s."
+"Přijaty %d nové zprávy\n"
+"ve složce %s."
 msgstr[2] ""
-"Dorazilo vám %d nových zpráv\n"
-"v %s."
+"Přijato %d nových zpráv\n"
+"ve složce %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:445
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
-msgstr[0] "Přišla vám %d nová zpráva."
-msgstr[1] "Přišly vám %d nové zprávy."
-msgstr[2] "Přišlo vám %d nových zpráv."
+msgstr[0] "Přijata %d nová zpráva."
+msgstr[1] "Přijaty %d nové zprávy."
+msgstr[2] "Přijato %d nových zpráv."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:462
 msgid "New email"
 msgstr "Nový e-mail"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:519
 msgid "Show icon in _notification area"
 msgstr "Zobrazovat ikonu v _oznamovací oblasti"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:522
 msgid "B_link icon in notification area"
 msgstr "B_likat s ikonou v oznamovací oblasti"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:524
 msgid "Popup _message together with the icon"
 msgstr "V_yskakovací zpráva společně s ikonou"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:705
 msgid "_Play sound when new messages arrive"
 msgstr "Za_hrát zvuk, když přijde nová pošta"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:711
 msgid "_Beep"
 msgstr "_Pípnout"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:712
 msgid "Play _sound file"
 msgstr "Přehrát _zvukový soubor"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:723
 msgid "Specify _filename:"
 msgstr "Zvolte _název souboru:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:724
 msgid "Select sound file"
 msgstr "Vyberte zvukový soubor"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:725
 msgid "Pl_ay"
 msgstr "Pře_hrát"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:782
 msgid "Notify new messages for _Inbox only"
 msgstr "Upozo_rnit pouze na nové zprávy v Příchozích"
 
@@ -18978,11 +19458,6 @@ msgstr "_Zásuvné moduly"
 msgid "Author(s)"
 msgstr "Autoři"
 
-#: ../plugins/plugin-manager/plugin-manager.c:43
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Popis"
-
 #: ../plugins/plugin-manager/plugin-manager.c:130
 msgid "Configuration"
 msgstr "Nastavení"
@@ -19149,6 +19624,32 @@ msgstr ""
 "iCal\n"
 "volné/obsazené"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+#, fuzzy
+msgid "Hello Python"
+msgstr "Telefon domů"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+#, fuzzy
+msgid "Python Loader"
+msgstr "Načítač Mono"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (vestavěn)"
@@ -19243,7 +19744,6 @@ msgid "MIME Type"
 msgstr "Typ MIME"
 
 #: ../plugins/save-attachments/save-attachments.c:347
-#: ../ui/evolution-editor.xml.h:12
 msgid "Save"
 msgstr "Uložit"
 
@@ -19450,6 +19950,34 @@ msgstr "Seskupovat zprávy podle předmětu"
 msgid "F_all back to threading messages by subject"
 msgstr "_Seskupovat zprávy podle předmětu"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+#, fuzzy
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Seznam vodítek pro zásuvný modul připomínající přílohu, které má hledat v "
+"těle zprávy."
+
+#: ../plugins/templates/templates.c:614
+#, fuzzy
+msgid "No title"
+msgstr "Název pozice"
+
+#: ../plugins/templates/templates.c:743
+#, fuzzy
+msgid "Save as _Template"
+msgstr "Uložit jako koncept"
+
+#: ../plugins/templates/templates.c:745
+#, fuzzy
+msgid "Save as Template"
+msgstr "Uložit jako koncept"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr ""
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr ""
@@ -19476,116 +20004,112 @@ msgid "Evolution Test component"
 msgstr "Komponenta testů Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "Popis aktuálního nastavení tiskárny."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Authenticate proxy server connections"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 #, fuzzy
 msgid "Automatic proxy configuration URL"
 msgstr "Automatické rozpoznávání odkazů"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Verze nastavení"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Decides whether the crash detection should be run or not."
 msgstr "Určuje, jestli má detekce havárie běžet nebo ne."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Implicitní šířka bočního panelu"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "Implicitní výška okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "Implicitní stav okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "Implicitní šířka okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 #, fuzzy
 msgid "HTTP proxy password"
 msgstr "Zadejte heslo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy username"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID nebo alias komponenty, kterou implicitně zobrazit po spuštění."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username/password combo is defined by \"/apps/evolution/shell/network_config/"
 "authentication_user\" and locally stored password in .gnome2_private/."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
 msgstr "Verze posledního aktualizovaného nastavení"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Seznam cest ke složkám, které synchronizovat na disk pro použití v režimu "
 "odpojení"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Non-proxy hosts"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 #, fuzzy
 msgid "Proxy configuration mode"
 msgstr "Nastavení"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "SOCKS proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Secure HTTP proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19593,27 +20117,27 @@ msgid ""
 "\" respectively."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "Boční panel je viditelný"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "Přeskakovat dialog varování o vývoji"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
 msgstr "Přeskakovat dialog varování o obnovení"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
 msgid "Start in offline mode"
 msgstr "Spustit v režimu off-line"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "Stavová lišta je viditelná"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19621,19 +20145,19 @@ msgstr ""
 "Verze nastavení Evolution, jako hlavní/vedlejší/úrovně nastavení (například "
 "\"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default height for the main window, in pixels."
 msgstr "Implicitní výška hlavního okna v pixelech."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "The default width for the main window, in pixels."
 msgstr "Implicitní šířka hlavního okna v pixelech."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "Implicitní šířka bočního panelu v pixelech."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19641,37 +20165,37 @@ msgstr ""
 "Poslední verze aktualizovaného nastavení Evolution, s hlavní/vedlejší/úrovní "
 "nastavení (například \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid "The machine name to proxy secure HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy socks through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19681,7 +20205,7 @@ msgstr ""
 "li nastaveno \"toolbar\", styl tlačítek je určen nastavením lišt nástrojů "
 "GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -19689,65 +20213,65 @@ msgid ""
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "Lišta nástrojů je viditelná"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 #, fuzzy
 msgid "URL that provides proxy configuration values."
 msgstr "Verze posledního aktualizovaného nastavení"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Jestli se má Evolution spouštět v režimu off-line místo on-line."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether crash detection should be done or not"
 msgstr "Jestli má být udělána detekce pádu nebo ne"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether or not the window should be maximized."
 msgstr "Jestli mají být okna maximalizovaná."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "Jestli má být boční panel viditelný."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the status bar should be visible."
 msgstr "Jestli má být stavový řádek viditelný."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
 msgstr "Jestli má být lišta nástrojů viditelná."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Jestli se přeskakuje dialog varování ve vývojových verzích Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in recovery of Evolution is skipped."
 msgstr "Jestli se přeskakuje dialog varování během obnovení Evolutionu."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "Jestli mají být tlačítka okna viditelná."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Styl tlačítek okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Tlačítka okna jsou viditelná"
 
@@ -19820,29 +20344,9 @@ msgstr "Importovat _jeden soubor"
 msgid "Evolution Preferences"
 msgstr "Nastavení Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Není zadán název složky."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Název složky nesmí obsahovat znak Enter."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Název složky nesmí obsahovat znak \"/\"."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Název složky nesmí obsahovat znak \"#\"."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' a '..' jsou rezervované názvy složek."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:335
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19867,7 +20371,7 @@ msgstr "Nemohu spustit bug buddy."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:742
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Radka Doulíková <doulikova@centrum.cz>\n"
@@ -19879,43 +20383,49 @@ msgstr ""
 "Jiří Eischmann <jiri@eischmann.cz>\n"
 "Petr Kovář <pknbe@volny.cz>"
 
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Webová stránka Evolution"
 
-#: ../shell/e-shell-window-commands.c:771
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Chyba při otevírání stránky FAQ."
 
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "Pracovat _on-line"
 
-#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "_Pracovat při odpojení"
 
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Pracovat při odpojení"
 
-#: ../shell/e-shell-window.c:384
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:377
+#, fuzzy
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
 "Evolution je nyní on-line. Stiskem tohoto tlačítka přejdete do režimu off-"
 "line."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution přechází do režimu off-line."
 
-#: ../shell/e-shell-window.c:398
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:391
+#, fuzzy
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
 "Evolution je nyní off-line. Stiskem tohoto tlačítka přejdete do režimu on-"
 "line."
 
-#: ../shell/e-shell-window.c:807
+#: ../shell/e-shell-window.c:780
 #, c-format
 msgid "Switch to %s"
 msgstr "Přepnout na %s"
@@ -19945,9 +20455,9 @@ msgstr "Nemohu se registrovat u OAF"
 msgid "Configuration Database not found"
 msgstr "Databáze nastavení nebyla nalezena"
 
-#: ../shell/e-user-creatable-items-handler.c:671
-#: ../shell/e-user-creatable-items-handler.c:681
-#: ../shell/e-user-creatable-items-handler.c:686
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "Nový"
 
@@ -20865,7 +21375,7 @@ msgstr "Uložit kontakty z vybrané složky jako VCard"
 msgid "Select All"
 msgstr "Vybrat vše"
 
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
 msgstr "Vybrat _vše"
 
@@ -21072,192 +21582,6 @@ msgstr "Pracovní týden"
 msgid "_Open Appointment"
 msgstr "_Otevřít událost"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Kliknutím zde vyberete soubor pro přílohu"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Kliknutím zde uzavřete aktuální okno"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Kliknutím sem uložíte aktuální okno"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Kliknutím zde zobrazíte dostupnou nápovědu"
-
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "Zavřít"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Kopírovat vybraný text do schránky"
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Vyjmout vybraný text do schránky"
-
-#: ../ui/evolution-editor.xml.h:10
-msgid "I_nsert"
-msgstr "_Vložit"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Vložit text ze schránky"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Vybrat všechen text"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "Nápo_věda"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "V_olby"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Celodenní událost"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Celo_denní událost"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Zařadit mezi důvěrné"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Zařadit mezi soukromé"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Zařadit mezi veřejné"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Kliknutím sem nastavíte nebo zrušíte alarmy pro tuto událost"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Vložit pokročilé možnosti odesílání"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Vytvoří opakující se událost"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Veř_ejné"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Informace o volném/obsazeném čase pro tuto schůzku"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "S_loupce Funkce"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "Možnosti _odesílání"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Zobrazovat čas jako _obsazený"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Časové pás_mo"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Přepne zobrazení pole účastníka"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Přepne zobrazení pole RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Přepne zobrazení pole pro funkce"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Přepne zobrazení pole stavu"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Přepne zobrazení pole pro časovou zónu"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Přepne zobrazení kategorií"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Přepne událost na celodenní"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Přepne čas jako obsazený"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Alarmy"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Kategorie"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "Klasi_fikace"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Důvěrné"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "V_olno/obsazeno"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "Soukro_mé"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "Opaková_ní"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "Sloupe_c Stav"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "Sloupec T_yp"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Zrušit aktuální operaci pošty"
@@ -21368,7 +21692,7 @@ msgstr "_Přihlášení"
 
 #: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
-msgstr "S_vislý náhled"
+msgstr "S_vislé zobrazení"
 
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
@@ -21397,7 +21721,7 @@ msgstr "Vyjmout vybrané zprávy do schránky"
 
 #: ../ui/evolution-mail-list.xml.h:8
 msgid "E_xpand All Threads"
-msgstr "_Rozbalit všechny vlákna"
+msgstr "_Rozbalit všechna vlákna"
 
 #: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
@@ -21405,7 +21729,7 @@ msgstr "_Vyčistit"
 
 #: ../ui/evolution-mail-list.xml.h:10
 msgid "Expand all message threads"
-msgstr "Rozbalit všechny vlákna"
+msgstr "Rozbalit všechna vlákna"
 
 #: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
@@ -21959,6 +22283,10 @@ msgstr "Z_většit"
 msgid "_Zoom In"
 msgstr "Z_většit"
 
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Zavřít"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Hlavní nástrojová lišta"
@@ -21995,22 +22323,6 @@ msgstr "Zobrazit vybranou poznámku"
 msgid "_Open Memo"
 msgstr "Ot_evřít poznámku"
 
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Kliknutím změníte / zobrazíte stav úkolu"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Podrobnosti o stavu"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Časové pásmo"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "Podrobno_sti o úkolu"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Kopírovat vybrané úkoly"
@@ -22053,7 +22365,7 @@ msgstr "Zobrazit okno s náhledem úkolu"
 
 #: ../ui/evolution-tasks.xml.h:19
 msgid "Task _Preview"
-msgstr "_Náhled zprávy"
+msgstr "_Náhled úkolu"
 
 #: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
@@ -22465,38 +22777,10 @@ msgstr "Typ zobrazení"
 msgid "Type of view:"
 msgstr "Typ zobrazení:"
 
-#: ../widgets/misc/e-attachment-bar.c:108
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../widgets/misc/e-attachment-bar.c:114
-#, c-format
-msgid "%.1f KB"
-msgstr "%.1f KB"
-
-#: ../widgets/misc/e-attachment-bar.c:117
-#, c-format
-msgid "%.1f MB"
-msgstr "%.1f MB"
-
-#: ../widgets/misc/e-attachment-bar.c:120
-#, c-format
-msgid "%.1f GB"
-msgstr "%.1f GB"
-
-#: ../widgets/misc/e-attachment-bar.c:1168
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Lišta příloh"
 
-#: ../widgets/misc/e-attachment-bar.c:1414
-#, fuzzy
-msgid "Recent Docu_ments"
-msgstr "Dokončeno procent"
-
 #: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
 #: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
@@ -22575,16 +22859,16 @@ msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Minimální šířka"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Minimální šířka"
 
@@ -22850,6 +23134,15 @@ msgstr ""
 "Widget interaktivní mapy ovládané myší pro výběr časového pásma. Uživatelé "
 "klávesnice by měli vybrat časové pásmo z kombinovaného pole níže."
 
+#: ../widgets/misc/e-online-button.c:112
+#, fuzzy
+msgid "Online"
+msgstr "Vložené"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr ""
+
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Synchronizovat s:"
@@ -22874,52 +23167,52 @@ msgstr "Model přeformátování"
 msgid "Column width"
 msgstr "Šířka sloupce"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "Hledat"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "Kliknutím zde změníte typ vyhledávání"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "_Hledat"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "_Hledat"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "Vy_mazat"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "ID položky"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Text"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1009
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "_Zobrazit: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1026
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "_Hledat: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1038
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " _v "
 
@@ -22969,10 +23262,6 @@ msgstr "<b>Sledování stavu</b>"
 msgid "A_uto-delete sent item"
 msgstr "_Automaticky odstranit odeslanou položku"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Klasifikace"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "_Vytvořit odeslanou položku po sledování informací"
@@ -23079,14 +23368,14 @@ msgid "_When opened:"
 msgstr "_Při otevření:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:289
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:295
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hotovo)"
@@ -23304,81 +23593,81 @@ msgstr[0] "%s (%d položka)"
 msgstr[1] "%s (%d položky)"
 msgstr[2] "%s (%d položek)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Střídající se barvy řádků"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
 #: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "Kreslit vodorovný rastr"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
 #: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "Kreslit svislý rastr"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
 #: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "Kreslit zaměření"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Režim kurzoru"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Model výběru"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
 #: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "Práh délky"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
 #: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "Stejná výška řádku"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "Zmrazen"
 
@@ -23454,24 +23743,24 @@ msgstr "Řadicí informace"
 msgid "Tree"
 msgstr "Strom"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Záhlaví tabulky"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Model tabulky"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Řádek kurzoru"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
 #: ../widgets/table/e-tree.c:3356
 msgid "Always search"
 msgstr "Vždy hledat"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Přidejte kliknutím"
 
@@ -23591,6 +23880,53 @@ msgstr "Kontext IM"
 msgid "Handle Popup"
 msgstr "Obsloužit kontextovou nabídku"
 
+#, fuzzy
+#~ msgid ""
+#~ "'{0}' is a read-only calendar source. Change Calendar to one that can "
+#~ "accept appointments."
+#~ msgstr ""
+#~ "'{0}' je zdroj kalendáře pouze pro čtení. Přepněte na náhled kalendáře a "
+#~ "zvýrazněte kalendář, který může přijmout události."
+
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "Popis aktuálního nastavení tiskárny."
+
+#~ msgid "No folder name specified."
+#~ msgstr "Není zadán název složky."
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "Název složky nesmí obsahovat znak Enter."
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "Název složky nesmí obsahovat znak \"/\"."
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "Název složky nesmí obsahovat znak \"#\"."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "'.' a '..' jsou rezervované názvy složek."
+
+#~ msgid "All Day Event"
+#~ msgstr "Celodenní událost"
+
+#~ msgid "Send _Options"
+#~ msgstr "Možnosti _odesílání"
+
+#~ msgid "Status Details"
+#~ msgstr "Podrobnosti o stavu"
+
+#~ msgid "Time Zone"
+#~ msgstr "Časové pásmo"
+
+#~ msgid "%.1f KB"
+#~ msgstr "%.1f KB"
+
+#~ msgid "%.1f MB"
+#~ msgstr "%.1f MB"
+
+#~ msgid "%.1f GB"
+#~ msgstr "%.1f GB"
+
 #~ msgid "Permission Denied."
 #~ msgstr "Oprávnění zamítnuto."
 
diff --git a/po/de.po b/po/de.po
index eeeb28799b..11ef0c7409 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 # Manuel Borchers <webmaster@matronix.de>, 2002.
 # Kai Lahmann <kl@linuxfaqs.de>, 2000.
 # Matthias Warkus <mawa@iname.com>, 2000.
-# Hendrik Richter <hendrikr@gnome.org>, 2004, 2005, 2006, 2007.
+# Hendrik Richter <hendrikr@gnome.org>, 2004, 2005, 2006, 2007, 2008.
 # Frank Arnold <frank@scirocco-5v-turbo.de>, 2005.
 # Christian Kintner <mail@christian-kintner.de>, 2006, 2007.
 # Andre Klapper <ak-47@gmx.net>, 2007, 2008.
@@ -16,13 +16,14 @@
 # bcc = Blindkopie
 # send options = Versandoptionen
 #
+#: ../shell/main.c:683
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-31 14:47+0200\n"
-"PO-Revision-Date: 2008-03-31 14:53+0200\n"
-"Last-Translator: Philipp Kerling <k.philipp@gmail.com>\n"
+"POT-Creation-Date: 2008-07-29 20:15+0200\n"
+"PO-Revision-Date: 2008-07-29 20:15+0200\n"
+"Last-Translator: Hendrik Richter <hendrikr@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,21 +32,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution addressbook"
 msgstr "Evolution-Adressbuch"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../a11y/addressbook/ea-minicard-view.c:32
 #: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../a11y/addressbook/ea-minicard-view.c:33
 #: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Neue Kontaktliste"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -53,7 +54,6 @@ msgstr[0] "Angezeigter Adressbuchordner %s enthält %d Karte"
 msgstr[1] "Angezeigter Adressbuchordner %s enthält %d Karten"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Öffnen"
 
@@ -163,7 +163,7 @@ msgid "calendar view for one or more days"
 msgstr "Kalenderansicht für einen oder mehrere Tage"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:758
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %B %Y"
 
@@ -174,18 +174,18 @@ msgstr "%A, %d. %B %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:841 ../calendar/gui/e-day-view.c:1545
-#: ../calendar/gui/e-week-view-main-item.c:331
+#: ../calendar/gui/calendar-component.c:761
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
+#: ../calendar/gui/e-week-view-main-item.c:340
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:768
+#: ../calendar/gui/calendar-component.c:770
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %Y"
 
@@ -193,10 +193,10 @@ msgstr "%a, %d. %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:797
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
@@ -206,15 +206,15 @@ msgstr "%d. %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:845 ../calendar/gui/e-day-view.c:1561
-#: ../calendar/gui/e-week-view-main-item.c:345
+#: ../calendar/gui/calendar-component.c:787
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
+#: ../calendar/gui/e-week-view-main-item.c:354
 msgid "%d %b"
 msgstr "%d. %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:247
 #: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:772
+#: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "GNOME Calendar"
 
@@ -326,31 +326,32 @@ msgstr "Kalender: von %s bis %s"
 msgid "evolution calendar item"
 msgstr "Evolution Kalenderelement"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:39
 msgid "Combo Button"
 msgstr "Auswahllistenknopf"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:49
 msgid "Activate Default"
 msgstr "Vorgabe verwenden"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:51
 msgid "Popup Menu"
 msgstr "Kontextmenü"
 
-#: ../a11y/widgets/ea-expander.c:40
+#: ../a11y/widgets/ea-expander.c:39
 msgid "Toggle Attachment Bar"
 msgstr "Anlagenleiste ein-/ausblenden"
 
-#: ../a11y/widgets/ea-expander.c:50
+#: ../a11y/widgets/ea-expander.c:49
 msgid "activate"
 msgstr "aktivieren"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
+#, fuzzy
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr ""
 "»{0}« ist ein schreibgeschütztes Adressbuch. Wechseln Sie zur Kontakte-"
 "Ansicht und wählen Sie ein Adressbuch aus, das Kontakte akzeptieren kann."
@@ -399,10 +400,11 @@ msgid "Could not remove addressbook."
 msgstr "Adressbuch konnte nicht entfernt werden."
 
 #: ../addressbook/addressbook.error.xml.h:11
+#, fuzzy
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
 "Momentan können Sie mit Evolution nur auf das GroupWise-Systemadressbuch "
 "zugreifen. Bitte verwenden Sie einmalig eine andere GroupWise-E-Mail-"
@@ -427,7 +429,7 @@ msgstr "Legitimation am LDAP-Server gescheitert."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
 msgid "Failed to delete contact"
 msgstr "Kontakt konnte nicht gelöscht werden"
 
@@ -533,9 +535,10 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:35
 #, fuzzy
-msgid ""
-"You do not have enough permissions to delete contact in this Address Book."
-msgstr "Sie haben keine ausreichenden Rechte um diese E-Mail zu löschen."
+msgid "You do not have permission to delete contacts in this address book."
+msgstr ""
+"Sie haben keine ausreichenden Rechte um Kontakte in diesem Adressbuch zu "
+"löschen."
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
@@ -576,8 +579,8 @@ msgid "_Use as it is"
 msgstr "_Wie es ist benutzen"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -586,17 +589,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "Voreingestellte Synchronisierungsadresse:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
 msgid "Could not load addressbook"
 msgstr "Adressbuch konnte nicht geladen werden"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "Adress-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
@@ -618,10 +621,10 @@ msgstr "Hier können Sie die Auto-Vervollständigung konfigurieren"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
 msgstr "Kontakte"
 
@@ -630,7 +633,8 @@ msgid "Evolution Address Book"
 msgstr "Evolution-Adressbuch"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
+#, fuzzy
+msgid "Evolution Address Book address popup"
 msgstr "Adressenfenster des Evolution-Adressbuchs"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
@@ -662,11 +666,12 @@ msgstr "Hier können Sie Ihre S/MIME-Zertifikate verwalten"
 #: ../addressbook/gui/component/addressbook-component.c:144
 #: ../addressbook/gui/component/addressbook-migrate.c:499
 #: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:584 ../calendar/gui/migration.c:1098
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:308
-#: ../mail/mail-vfolder.c:216
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "Auf diesem Computer"
 
@@ -679,15 +684,16 @@ msgstr "Auf diesem Computer"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:592 ../calendar/gui/migration.c:1106
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Persönlich"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "Auf LDAP-Servern"
@@ -709,7 +715,7 @@ msgid "Create a new contact list"
 msgstr "Eine neue Kontaktliste anlegen"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-config.c:1192
 msgid "New Address Book"
 msgstr "Neues Adressbuch"
 
@@ -725,72 +731,72 @@ msgstr "Ein neues Adressbuch anlegen"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Aktualisieren der Adressbucheinstellungen oder -ordner gescheitert."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:315
 msgid "Base"
 msgstr "Basis"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:516
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "A_rt:"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:618
 msgid "Copy _book content locally for offline operation"
 msgstr "Den Adressbuchinhalt lokal zum Arbeiten im Offline-Modus _kopieren"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/addressbook-config.c:967
 #: ../addressbook/gui/component/ldap-config.glade.h:20
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2356
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../calendar/gui/dialogs/calendar-setup.c:388
+#: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Allgemein"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:972
 msgid "Server Information"
 msgstr "Server-Informationen"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:974
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:977
 #: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Details"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../addressbook/gui/component/addressbook-config.c:978
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "Suchen"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:980
 msgid "Downloading"
 msgstr "Herunterladen"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1190
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Adressbucheigenschaften"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migrationsvorgang …"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "»%s« wird migriert:"
@@ -846,48 +852,48 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Pilot-Sync-Daten …"
 
-#: ../addressbook/gui/component/addressbook-view.c:434
+#: ../addressbook/gui/component/addressbook-view.c:430
 #: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Den Ordner »%s« umbenennen in:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../addressbook/gui/component/addressbook-view.c:433
 #: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "Ordner umbenennen"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
+#: ../addressbook/gui/component/addressbook-view.c:438
 #: ../mail/em-folder-utils.c:511
 msgid "Folder names cannot contain '/'"
 msgstr "Ordnernamen dürfen das Slash-Zeichen »/« nicht enthalten"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "_New Address Book"
 msgstr "_Neues Adressbuch"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:951
 msgid "Save As vCard..."
 msgstr "Als VCard speichern …"
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2091 ../mail/em-folder-view.c:1346
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/calendar-component.c:620
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Löschen"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:957
 msgid "_Properties..."
 msgstr "Ei_genschaften …"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "Kontaktquellenauswahl"
 
@@ -896,19 +902,19 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Der Zugriff auf den LDAP-Server erfolgt anonym"
 
 #: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "Legitimation gescheitert.\n"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Geben Sie das Passwort für %s ein (Benutzer %s)"
 
 #: ../addressbook/gui/component/addressbook.c:215
 #: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "Passwort eingeben"
@@ -1003,7 +1009,7 @@ msgid "Add Address Book"
 msgstr "Adressbuch hinzufügen"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:777
+#: ../mail/em-account-editor.c:761
 msgid "Always"
 msgstr "Immer"
 
@@ -1038,14 +1044,14 @@ msgid "Lo_gin:"
 msgstr "Anm_eldename:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../mail/em-account-editor.c:776
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "Nie"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:23
-#: ../mail/em-account-editor.c:304
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Keine Verschlüsselung"
 
@@ -1057,7 +1063,7 @@ msgstr "Eins"
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:312
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL-Verschlüsselung"
 
@@ -1125,7 +1131,7 @@ msgstr "Unterstützte Suchbasen"
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:36
-#: ../mail/em-account-editor.c:308
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS-Verschlüsselung"
 
@@ -1148,8 +1154,8 @@ msgid ""
 msgstr ""
 "Der Suchbereich legt fest, wie tief Sie bei der Suche im Verzeichnisbaum "
 "absteigen wollen. Der Suchbereich »sub« schließt alle Einträge unterhalb des "
-"Suchbereichs ein. Der Suchbereich »one« hingegen schließt lediglich die "
-"Ebene unterhalb des Ausgangspunktes der Suche ein."
+"Suchbereichs ein. Der Suchbereich »one« hingegen schließt lediglich die Ebene "
+"unterhalb des Ausgangspunktes der Suche ein."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
@@ -1197,7 +1203,7 @@ msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
-msgstr "Eindeutigen Namen (EN) verwenden"
+msgstr "Eindeutigen Namen (DN) verwenden"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
@@ -1224,8 +1230,8 @@ msgid "_Login method:"
 msgstr "An_meldemethode:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:173
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1240,7 +1246,7 @@ msgid "_Search scope:"
 msgstr "_Suchbereich:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:54
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
@@ -1261,9 +1267,9 @@ msgstr "Karten"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:401
 msgid "minutes"
 msgstr "Minuten"
 
@@ -1304,7 +1310,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Geschäftlich</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1316,16 +1322,16 @@ msgid "Ca_tegories..."
 msgstr "Ka_tegorien …"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
@@ -1338,7 +1344,7 @@ msgid "Image"
 msgstr "Grafik"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN-Messenger"
 
@@ -1351,7 +1357,7 @@ msgid "Nic_kname:"
 msgstr "_Spitzname:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1365,11 +1371,11 @@ msgstr "Telefon"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Geschäftlich"
 
@@ -1391,7 +1397,7 @@ msgid "_Birthday:"
 msgstr "_Geburtstag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
@@ -1481,1122 +1487,1122 @@ msgstr "_In:"
 msgid "_Zip/Postal Code:"
 msgstr "Postleit_zahl:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "Adresse"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "Editierbar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "Vereinigte Staaten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "Albanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "Algerien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "Amerikanisch-Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "Antarktis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Antigua And Barbuda"
 msgstr "Antigua und Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "Argentinien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "Armenien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "Australien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "Österreich"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "Aserbaidschan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "Bangladesch"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "Weißrussland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "Bolivien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnien und Herzegowina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "Botswana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "Bouvet-Insel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "British Indian Ocean Territory"
 msgstr "Britisches Territorium im Indischen Ozean"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "Bulgarien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "Kambodscha"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "Kapverdische Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "Cayman-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Central African Republic"
 msgstr "Zentralafrikanische Republic"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "Tschad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "Chile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "China"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "Weihnachtsinsel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokos-(Keeling-)Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "Kolumbien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "Komoren"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "Kongo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Demokratische Republik Congo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "Cook-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "Elfenbeinküste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "Kroatien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "Kuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "Zypern"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "Tschechische Republik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "Dänemark"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "Dschibuti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "Dominikanische Republik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "Ägypten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "Äquatorial-Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "Estland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "Äthiopien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "Falkland-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "Färöer-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "Fidschi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "Finnland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "Frankreich"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "Französisch-Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "Französisch-Polynesian"
 
 # CHECK - Source: Database of program "Ding"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "French Southern Territories"
 msgstr "Französische Südpolar-Territorien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "Gabun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "Gambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "Georgien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "Deutschland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "Griechenland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "Grönland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "Haiti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Heard And McDonald Islands"
 msgstr "Heard- und McDonald-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "Heiliger Stuhl"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "Hongkong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "Ungarn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "Island"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "Indien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "Indonesien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "Iran"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "Irland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "Italien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "Jamaika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "Japan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "Jordanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Kasachstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Kenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Demokratische Volksrepublik Korea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Korea, Republic Of"
 msgstr "Republik Korea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "Kirgisistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "Lettland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "Libyen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "Mazedonien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "Malediven"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "Marshall-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "Martinique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "Mauretanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "Mikronesien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Moldova, Republic Of"
 msgstr "Moldawien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "Monaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "Mongolei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "Marokko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "Mosambik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "Namibia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "Niederlande"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "Niederländische Antillen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "Neukaledonien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "Neuseeland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "Niger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "Norfolkinsel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Northern Mariana Islands"
 msgstr "Nördliche Marianen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "Norwegen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "Oman"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "Palästinensisches Autonomiegebiet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "Panama"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Papua New Guinea"
 msgstr "Papua-Neuguinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "Peru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "Philippinen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "Polen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "Katar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "Reunion"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "Rumänien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "Russische Föderation"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts und Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "St. Licia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Saint Vincent And The Grenadines"
 msgstr "Saint Vincent und die Grenadinen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "San Marino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome und Principe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Serbia And Montenegro"
 msgstr "Serbien und Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "Seychellen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "Slowakei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "Slowenien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "Solomon-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "Somalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "Südafrika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Südgeorgien und die Südlichen Sandwichinseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "Spanien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre und Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "Sudan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard- und Jan-Mayen-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "Swasiland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "Schweden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "Schweiz"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "Syrien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "Tadschikistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tanzania, United Republic Of"
 msgstr "Vereinigte Republik Tansania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Trinidad And Tobago"
 msgstr "Trinidad und Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "Tunesien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "Türkei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Turks And Caicos Islands"
 msgstr "Turks und Caicos-Inseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Arab Emirates"
 msgstr "Vereinigte Arabische Emirate"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "Vereinigtes Königreich"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "United States Minor Outlying Islands"
 msgstr "Kleinere abseitsliegende Inseln der Vereinigten Staaten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, British"
 msgstr "Britische Jungferninseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Virgin Islands, U.S."
 msgstr "US-Jungferninseln"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis und Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "Westsahara"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "Jemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "Sambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "Simbabwe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../plugins/exchange-operations/exchange-delegates.c:952
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
+#: ../plugins/plugin-manager/plugin-manager.c:41
+#: ../plugins/save-attachments/save-attachments.c:350
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Name"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "AOL Instant Messenger"
 msgstr "AOL-Instant-Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Yahoo Messenger"
 msgstr "Yahoo-Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "_Gadu-Gadu-Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
 msgid "Service"
 msgstr "Dienst"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "Ort"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "Benutzername"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Privat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Weitere"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Source Book"
 msgstr "Quellbuch"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Target Book"
 msgstr "Zielbuch"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
 msgid "Is New Contact"
 msgstr "Ist neuer Kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Writable Fields"
 msgstr "Beschreibbare Felder"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Required Fields"
 msgstr "Benötigte Felder"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Geändert"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontakteditor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "Please select an image for this contact"
 msgstr "Bitte wählen Sie ein Bild für diesen Kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "_No image"
 msgstr "_Kein Bild"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2604,47 +2610,47 @@ msgstr ""
 "Die Kontaktdaten sind ungültig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "»%s« hat ein ungültiges Format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s»%s« hat ein ungültiges Format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s»%s« ist leer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
 msgid "Invalid contact."
 msgstr "Kontakt ungültig."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:334
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "Kontakt schnell hinzufügen"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "Voll _bearbeiten"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "_Voller Name"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "E-_Mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "Adressbuch aus_wählen"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2653,7 +2659,7 @@ msgstr ""
 "Sind Sie sicher, dass Sie\n"
 "diese Kontaktliste löschen wollen (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2661,7 +2667,7 @@ msgstr ""
 "Sind Sie sicher, dass Sie\n"
 "diese Kontaktlisten löschen wollen?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2670,7 +2676,7 @@ msgstr ""
 "Sind Sie sicher, dass Sie\n"
 "diesen Kontakt löschen wollen (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2822,9 +2828,9 @@ msgstr "_Mitglieder"
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
 #: ../addressbook/gui/widgets/e-addressbook-model.c:298
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:217
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Buch"
 
@@ -2869,40 +2875,39 @@ msgstr ""
 "Der Namen oder die E-Mail-Adresse dieses Kontakts existiert\n"
 "bereits in diesem Ordner. Soll er dennoch hinzugefügt werden?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
 msgid "Merge Contact"
 msgstr "Kontakte zusammenführen"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "_Zusammenführen"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
 #: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "E-Mail"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
-#: ../calendar/gui/cal-search-bar.c:81 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Ein beliebiges Feld enthält"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "E-Mail-Adresse beginnt mit"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Name beginnt mit"
+msgid "Name contains"
+msgstr "Name enthält"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2917,9 +2922,9 @@ msgstr[1] "%d Kontakte"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Abfrage"
 
@@ -2930,9 +2935,9 @@ msgstr "Fehler beim Abrufen der Buchansicht"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../widgets/text/e-text.c:3551
+#: ../widgets/table/e-table.c:3353
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "Modell"
 
@@ -2940,107 +2945,109 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Fehler beim Ändern einer Karte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+msgid "Name begins with"
+msgstr "Name beginnt mit"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "Quelle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../calendar/gui/e-meeting-list-view.c:508
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Art"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
 msgid "Save as vCard..."
 msgstr "Als VCard speichern …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1574
+#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "_Neuer Kontakt …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "Neue Kontakt_liste …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "Als VCard _speichern …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "Kontakt weiter_leiten"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "Kontakte weiter_leiten"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "_Nachricht an Kontakt schicken"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "_Nachricht an Liste schicken"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "_Nachricht an Kontakte schicken"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "_Drucken"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "In Adressbuch _kopieren …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "In Adressbuch _verschieben …"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:3099 ../mail/em-folder-tree.c:997
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2064
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "E_infügen"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
+#: ../calendar/gui/cal-search-bar.c:680
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "Anderer Fehler"
 
@@ -3075,7 +3082,7 @@ msgstr "Autotelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:169
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3176,9 +3183,9 @@ msgid "Radio"
 msgstr "Funk"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:713
 msgid "Role"
 msgstr "Position"
 
@@ -3215,38 +3222,38 @@ msgid "Web Site"
 msgstr "Website"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
 #: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
+#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Breite"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Höhe"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Hat Fokus"
 
@@ -3266,11 +3273,22 @@ msgstr "Textmodell"
 msgid "Max field name length"
 msgstr "Maximale Länge des Feldnamens"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
 msgid "Column Width"
 msgstr "Spaltenbreite"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Suche nach dem Kontakt."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3284,7 +3302,7 @@ msgstr ""
 "\n"
 "Doppelklicken Sie hier, um einen neuen Kontakt anzulegen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3298,7 +3316,7 @@ msgstr ""
 "\n"
 "Doppelklicken Sie hier, um einen neuen Kontakt anzulegen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3308,7 +3326,7 @@ msgstr ""
 "\n"
 "Suche nach dem Kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3318,41 +3336,41 @@ msgstr ""
 "\n"
 "In dieser Ansicht existieren keine anzuzeigenden Einträge."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adapter"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "E-Mail, geschäftlich"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "E-Mail, privat"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
-#: ../addressbook/gui/widgets/e-minicard.c:833
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "Weitere E-Mail-Adresse"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Gewählt"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Hat Cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
 msgid "_Open Link in Browser"
 msgstr "Link im Browser ö_ffnen"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "Link-Ziel _kopieren"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
 msgid "_Send New Message To..."
 msgstr "Neue Nachricht _schicken an …"
 
@@ -3395,15 +3413,15 @@ msgid "Video Chat"
 msgstr "Video-Chat"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/gnome-cal.c:2376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:574
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
 #: ../plugins/hula-account-setup/camel-hula-listener.c:378
 #: ../plugins/hula-account-setup/camel-hula-listener.c:407
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -3412,8 +3430,7 @@ msgstr "Kalender"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "Verfügbarkeit"
 
@@ -3435,12 +3452,14 @@ msgid "Web Log"
 msgstr "Weblog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Geburtstag"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2336
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Jahrestag"
 
@@ -3457,103 +3476,103 @@ msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "Erfolg"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "Backend belegt"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "Repository offline"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "Adressbuch existiert nicht"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "No Self Contact defined"
 msgstr "Kein eigener Kontakt festgelegt"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "Kontakt nicht gefunden"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "Kontaktkennung existiert bereits"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "Protokoll nicht unterstützt"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2523
 msgid "Canceled"
 msgstr "Abgebrochen"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "Abbrechen gescheitert"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 #: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "Legitimation gescheitert"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "Legitimation erforderlich"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS nicht verfügbar"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "Keine derartige Quelle"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "Im Offline-Modus nicht verfügbar"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "Ungültige Server-Version"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#: ../addressbook/gui/widgets/eab-gui-util.c:101
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3565,7 +3584,7 @@ msgstr ""
 "laden Sie das Adressbuch einmal im Online-Modus, um dessen Inhalte "
 "herunterzuladen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3574,7 +3593,7 @@ msgstr ""
 "Dieses Adressbuch konnte nicht geöffnet werden. Bitte überprüfen Sie, ob der "
 "Pfad %s existiert und Sie darauf zugreifen dürfen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3583,7 +3602,7 @@ msgstr ""
 "Sie eine falschen URI eingegeben haben, oder dass der LDAP-Server nicht "
 "erreichbar ist."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3593,7 +3612,7 @@ msgstr ""
 "Falls Sie LDAP in Evolution verwenden wollen, müssen Sie eine LDAP-mächtige "
 "Evolution-Version installieren."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3602,7 +3621,7 @@ msgstr ""
 "Sie eine falsche URI eingegeben haben, oder dass der Server nicht erreichbar "
 "ist."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3614,7 +3633,7 @@ msgstr ""
 "oder erhöhen Sie das Zeitlimit in den Einstellungen des\n"
 "Verzeichnis-Servers für dieses Adressbuch."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3626,49 +3645,49 @@ msgstr ""
 "Bitte präzisieren Sie Ihre Suche oder erhöhen Sie das Zeitlimit in den\n"
 "Einstellungen des Verzeichnis-Servers für dieses Adressbuch."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Die Hintergrundkomponente für dieses Adressbuch konnte die Syntax dieser "
 "Abfrage nicht analysieren."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:169
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "Die Hintergrundkomponente für dieses Adressbuch konnte diese Abfrage nicht "
 "ausführen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid "This query did not complete successfully."
 msgstr "Diese Abfrage konnte nicht erfolgreich ausgeführt werden"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
 msgid "Error adding list"
 msgstr "Fehler beim Hinzufügen einer Liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
 #: ../addressbook/gui/widgets/eab-gui-util.c:670
 msgid "Error adding contact"
 msgstr "Fehler beim Hinzufügen eines Kontakts"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error modifying list"
 msgstr "Fehler beim Ändern einer Liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error modifying contact"
 msgstr "Fehler beim Ändern eines Kontakts"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 #: ../addressbook/gui/widgets/eab-gui-util.c:620
 msgid "Error removing contact"
 msgstr "Fehler beim Entfernen eines Kontakts"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:299
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3685,17 +3704,17 @@ msgstr[1] ""
 "geöffnet werden.\n"
 "Wollen Sie wirklich all diese Kontakte anzeigen?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:307
 msgid "_Don't Display"
 msgstr "_Nicht anzeigen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
 msgid "Display _All Contacts"
 msgstr "_Alle Kontakte anzeigen"
 
 # CHECK der Kontakt -> diesen?
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:334
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3704,7 +3723,7 @@ msgstr ""
 "%s existiert bereits\n"
 "Soll er überschrieben werden?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:338
 msgid "Overwrite"
 msgstr "Überschreiben"
 
@@ -3747,27 +3766,27 @@ msgstr "Kontakt verschieben nach"
 msgid "Copy contacts to"
 msgstr "Kontakte kopieren nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:883
 msgid "Multiple vCards"
 msgstr "Mehrere VCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 #, c-format
 msgid "vCard for %s"
 msgstr "VCard für %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:928
 #, c-format
 msgid "Contact information"
 msgstr "Kontaktinformationen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:930
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktinformationen für %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:313
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
 msgid "Querying Address Book..."
 msgstr "Adressbuch wird abgefragt …"
 
@@ -3795,43 +3814,43 @@ msgstr "In Adressbuch speichern"
 msgid "Card View"
 msgstr "Kartenansicht"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../addressbook/importers/evolution-csv-importer.c:658
+#: ../addressbook/importers/evolution-ldif-importer.c:498
 #: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importieren …"
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV oder Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV- und Tab-Importeur"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV oder Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV- und Tab-Importeur"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV oder Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV- und Tab-Importeur"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP-Datenaustauschformat (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "Evolution-LDIF-Importeur"
 
@@ -3884,11 +3903,11 @@ msgid "Format"
 msgstr "Format"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
 #: ../widgets/table/e-table-field-chooser-item.c:648
 #: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-header-item.c:1908
 #: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
 msgstr "Kopfzeile"
@@ -3991,7 +4010,7 @@ msgstr "Schattierung"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
+#: ../plugins/exchange-operations/exchange-account-setup.c:1055
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -4010,7 +4029,7 @@ msgid "Top:"
 msgstr "Oben:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:153
 msgid "Type:"
 msgstr "Art:"
 
@@ -4117,19 +4136,17 @@ msgstr "Unbehandelter Fehler"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-#, fuzzy
 msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
-"»{0}« ist ein schreibgeschützter Kalender. Wechseln Sie zur Kalenderansicht "
-"und wählen Sie einen Kalender aus, der Termine akzeptieren kann."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
+#, fuzzy
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
 "»{0}« ist ein schreibgeschützter Kalender. Wechseln Sie zur Kalenderansicht "
 "und wählen Sie einen Kalender aus, der Termine akzeptieren kann."
@@ -4232,19 +4249,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Sind Sie sicher, dass Sie diesen Termin löschen wollen?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/gui/dialogs/delete-comp.c:179
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Sind Sie sicher, dass Sie diese Besprechung löschen wollen?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Sind Sie sicher, dass Sie diese Notiz löschen wollen?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Sind Sie sicher, dass Sie diese Aufgabe löschen wollen?"
@@ -4272,9 +4289,8 @@ msgid "Cannot create a new event"
 msgstr "Anlegen eines neuen Ereignisses gescheitert"
 
 #: ../calendar/calendar.error.xml.h:29
-#, fuzzy
 msgid "Cannot save event"
-msgstr "Anlegen eines neuen Ereignisses gescheitert"
+msgstr "Ereignis kann nicht gespeichert werden"
 
 #: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
@@ -4413,7 +4429,8 @@ msgid "The calendar is not marked for offline usage."
 msgstr "Der Kalender ist nicht für eine Offline-Benutzung markiert."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
+#, fuzzy
+msgid "The memo list is not marked for offline usage."
 msgstr "Die Notizliste ist nicht für eine Offline-Benutzung markiert."
 
 #: ../calendar/calendar.error.xml.h:55
@@ -4522,8 +4539,7 @@ msgstr ""
 msgid "_Discard Changes"
 msgstr "Änderungen _verwerfen"
 
-#: ../calendar/calendar.error.xml.h:76 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "_Speichern"
 
@@ -4533,7 +4549,7 @@ msgstr "Änderungen _speichern"
 
 #: ../calendar/calendar.error.xml.h:78
 #: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "Ab_schicken"
 
@@ -4545,55 +4561,55 @@ msgstr "Nachricht ver_schicken"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Mehrtägige Ereignisse aufteilen:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-server konnte nicht gestartet werden"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kalender-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "Notiz-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "Notiz-Anwendungsblock des Pilot konnte nicht geschrieben werden"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Vorgabepriorität:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht geschrieben werden"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2347
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "Kalender und Aufgaben"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:1403
 msgid "Calendars"
 msgstr "Kalender"
 
@@ -4636,25 +4652,25 @@ msgid "Memo_s"
 msgstr "_Notizen"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1152
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
+#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "Notizen"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1442
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
+#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
+#: ../calendar/gui/tasks-component.c:540
+#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/importers/icalendar-importer.c:74
+#: ../calendar/importers/icalendar-importer.c:735
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Aufgaben"
@@ -4672,25 +4688,25 @@ msgstr "_Aufgaben"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution-Kalender-Alarmbenachrichtigungsdienst"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "Minute"
 msgstr[1] "Minuten"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:402
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "Stunde"
 msgstr[1] "Stunden"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "Anfangszeit"
 
@@ -4701,9 +4717,9 @@ msgstr "Termine"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Ort:"
@@ -4713,17 +4729,15 @@ msgid "Snooze _time:"
 msgstr "Schlummer_zeit:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:166
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:52
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:41
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
@@ -4735,32 +4749,32 @@ msgstr "_Schlummer"
 msgid "location of appointment"
 msgstr "Ort des Termins"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
 msgid "No summary available."
 msgstr "Keine Zusammenfassung verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
 msgid "No location information available."
 msgstr "Keine Ortinformationen verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sie haben %d Alarme"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1530
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1677
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1705
+#: ../mail/mail-component.c:1585
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1681
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4773,7 +4787,7 @@ msgstr ""
 "Evolution wird stattdessen ein normales\n"
 "Erinnerungsdialogfenster anzeigen."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4790,15 +4804,15 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
 msgid "Do not ask me about this program again."
 msgstr "Nicht mehr nach diesem Programm fragen."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo konnte nicht initialisiert werden"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4811,7 +4825,7 @@ msgid "invalid time"
 msgstr "ungültige Zeit"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4820,7 +4834,7 @@ msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4831,7 +4845,7 @@ msgstr[1] "%d Minuten"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
@@ -5086,12 +5100,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Statusfeld im Ereignis-/Aufgaben-/Besprechungseditor anzeigen"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show the \"Preview\" pane"
 msgstr "Das Vorschaufeld anzeigen"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show the \"Preview\" pane."
 msgstr "Das Vorschaufeld anzeigen."
 
@@ -5292,66 +5306,66 @@ msgstr "Minute, zu der der Arbeitstag beginnt"
 msgid "daylight savings time"
 msgstr "Sommerzeit"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Summary contains"
 msgstr "Zusammenfassung enthält"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Description contains"
 msgstr "Beschreibung enthält"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Category is"
 msgstr "Kategorie ist"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Comment contains"
 msgstr "Kommentar enthält"
 
-#: ../calendar/gui/cal-search-bar.c:80
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Location contains"
 msgstr "Ort enthält"
 
-#: ../calendar/gui/cal-search-bar.c:626 ../calendar/gui/cal-search-bar.c:669
-#: ../calendar/gui/cal-search-bar.c:688
+#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
+#: ../calendar/gui/cal-search-bar.c:684
 msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:630
 msgid "Next 7 Days' Tasks"
 msgstr "Aufgaben der nächsten 7 Tage"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:634
 msgid "Active Tasks"
 msgstr "Aktuelle Aufgaben"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:638
 msgid "Overdue Tasks"
 msgstr "Überfällige Aufgaben"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:642
 msgid "Completed Tasks"
 msgstr "Abgeschlossene Aufgaben"
 
-#: ../calendar/gui/cal-search-bar.c:650
+#: ../calendar/gui/cal-search-bar.c:646
 msgid "Tasks with Attachments"
 msgstr "Aufgaben mit Anlagen"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:692
 msgid "Active Appointments"
 msgstr "Aktuelle Termine"
 
-#: ../calendar/gui/cal-search-bar.c:700
+#: ../calendar/gui/cal-search-bar.c:696
 msgid "Next 7 Days' Appointments"
 msgstr "Termine der nächsten 7 Tage"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Drucken"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5361,15 +5375,15 @@ msgstr ""
 "sind. Falls Sie fortfahren, können Sie diese Ereignisse nicht "
 "wiederherstellen."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Ereignisse löschen älter als"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:397
+#: ../plugins/google-account-setup/google-source.c:403
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "Tage"
@@ -5378,106 +5392,106 @@ msgstr "Tage"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:512
-#: ../calendar/gui/migration.c:611 ../calendar/gui/migration.c:1125
-#: ../calendar/gui/tasks-component.c:231
+#: ../calendar/gui/calendar-component.c:274
+#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
+#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
+#: ../calendar/gui/tasks-component.c:232
 msgid "On The Web"
 msgstr "Im Web"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Geburts- und Jahrestage"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Wetter"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:616
 msgid "_New Calendar"
 msgstr "_Neuer Kalender"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2086
+#: ../calendar/gui/calendar-component.c:617
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Kopieren …"
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3637 ../mail/em-folder-tree.c:2100
+#: ../calendar/gui/calendar-component.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "Ei_genschaften"
 
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:950
 msgid "Failed upgrading calendars."
 msgstr "Auffrischen der Kalender gescheitert."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1249
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Der Kalender »%s« konnte nicht zum Anlegen von Ereignissen und Besprechungen "
 "geöffnet werden"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1265
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 "Es ist kein Kalender zum Anlegen von Ereignissen und Besprechungen verfügbar"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1378
 msgid "Calendar Source Selector"
 msgstr "Kalenderquellenauswahl"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Neuer Termin"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Neue Besprechung"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
 msgid "M_eeting"
 msgstr "_Besprechung"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Eine neue Besprechungsanfrage anlegen"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Neuer Ganztagstermin"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
 msgid "All Day A_ppointment"
 msgstr "_Ganztagstermin"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztätigen Termin anlegen"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Neuer Kalender"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Cale_ndar"
 msgstr "Ka_lender"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
@@ -5498,15 +5512,225 @@ msgid "Month View"
 msgstr "Monatsansicht"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#, fuzzy
+msgid "Any Field"
+msgstr "Feld"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Anlagen"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Teilnehmer"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "Geschäftlich"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Kategorie"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Einstufung"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#, fuzzy
+msgid "Competition"
+msgstr "Abschlussdatum"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Vertraulich"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Beschreibung"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "Beschreibung enthält"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "Existieren nicht"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Existieren"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Favoriten"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "Geschenke"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Ferien"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "Ferienkarten"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "Heiße Kontakte"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Ideen"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "International"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+#, fuzzy
+msgid "Key Customer"
+msgstr "Anpassen"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "Verschiedenes"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+#, fuzzy
+msgid "Next 7 days"
+msgstr "Aufgaben der nächsten 7 Tage"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "Organisator"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+#, fuzzy
+msgid "Phone Calls"
+msgstr "Telefon"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "Privat"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "Öffentlich"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:298
+msgid "Recurrence"
+msgstr "Wiederholung"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Status"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Strategien"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Zusammenfassung enthält"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+#, fuzzy
+msgid "Suppliers"
+msgstr "Antworten"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "Zeit &amp; Ausgaben"
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "VIP"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "Wartend"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "enthält"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "enthält nicht"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "ist"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "ist nicht"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Fehler beim Öffnen des Kalenders"
@@ -5519,11 +5743,11 @@ msgstr "Methode beim Öffnen des Kalenders nicht unterstützt"
 msgid "Permission denied to open the calendar"
 msgstr "Erlaubnis zum Öffnen des Kalenders verweigert"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "Alarm bearbeiten"
 
@@ -5556,17 +5780,17 @@ msgid "Mes_sage:"
 msgstr "_Nachricht:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "Einen Klang abspielen"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "Alarm-Popup anzeigen"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "Ein Programm ausführen"
 
@@ -5579,7 +5803,7 @@ msgid "Send To:"
 msgstr "Schicken an:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "Eine E-Mail verschicken"
 
@@ -5627,6 +5851,7 @@ msgid "hour(s)"
 msgstr "Stunde(n)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:242
 msgid "minute(s)"
 msgstr "Minute(n)"
 
@@ -5634,7 +5859,7 @@ msgstr "Minute(n)"
 msgid "start of appointment"
 msgstr "Beginn des Termins"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
 msgid "Action/Trigger"
 msgstr "Aktion/Auslöser"
 
@@ -5645,16 +5870,15 @@ msgstr "_Hinzufügen"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarme"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-msg-composer-select-file.c:93
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage _vorschlagen"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
 msgid "Attach file(s)"
 msgstr "Datei(en) beilegen"
 
@@ -5724,8 +5948,8 @@ msgid "Display"
 msgstr "Anzeigen"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Freitag"
 
@@ -5740,8 +5964,8 @@ msgstr ""
 "Tage"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Montag"
 
@@ -5764,7 +5988,7 @@ msgstr ""
 "Sonntag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Eine Farbe auswählen"
 
@@ -5774,8 +5998,8 @@ msgid "S_un"
 msgstr "_So"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -5792,8 +6016,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "_Wochennummern im Datumsnavigator anzeigen"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -5811,8 +6035,8 @@ msgid "Template:"
 msgstr "Vorlage:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Donnerstag"
 
@@ -5826,14 +6050,14 @@ msgid "Time format:"
 msgstr "Zeitformat:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Dienstag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Mittwoch"
 
@@ -5911,328 +6135,469 @@ msgstr "M_i"
 msgid "before every appointment"
 msgstr "vor jedem Termin"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:269
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Den Kalenderinhalt lokal zur Arbeit im Offline-Modus _kopieren"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "Den Inhalt der Aufgabenliste lokal zur Arbeit im Offline-Modus _kopieren"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Den Inhalt der Notizliste lokal zur Arbeit im Offline-Modus _kopieren"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:343
 msgid "Colo_r:"
 msgstr "_Farbe:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Task List"
 msgstr "Aufgabenliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:389
 msgid "Memo List"
 msgstr "Notizliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "Calendar Properties"
 msgstr "Kalendereigenschaften"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "New Calendar"
 msgstr "Neuer Kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "Task List Properties"
 msgstr "Aufgabenlisteneigenschaften"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "New Task List"
-msgstr "_Neue Aufgabenliste"
+msgstr "Neue Aufgabenliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "Memo List Properties"
-msgstr "Aufgabenlisteneigenschaften"
+msgstr "Notizlisteneigenschaften"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "New Memo List"
 msgstr "Neue Notizliste"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Dieses Ereignis wurde gelöscht."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Diese Aufgabe wurde gelöscht."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:66
 msgid "This memo has been deleted."
 msgstr "Diese Notiz wurde gelöscht."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Sie haben Änderungen vorgenommen. Diese verwerfen und den Editor "
 "schließen?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor schließen?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Dieses Ereignis wurde geändert."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Diese Aufgabe wurde geändert."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:90
 msgid "This memo has been changed."
 msgstr "Diese Notiz wurde geändert."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Sie haben Änderungen vorgenommen. Diese verwerfen und den Editor "
 "aktualisieren?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Validierungsfehler: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2340
 msgid " to "
 msgstr " bis "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2344
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2346
 msgid "Completed "
 msgstr "Abgeschlossen "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2351
 msgid " (Due "
 msgstr " (Fällig am "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2353
 msgid "Due "
 msgstr "Fällig am "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2849
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "Beigelegte Nachricht - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2854
-#: ../composer/e-msg-composer.c:3036
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
+#: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Beigelegte Nachricht"
 msgstr[1] "%d beigelegte Nachrichten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3100
-#: ../mail/em-folder-tree.c:998 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2065
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "_Verschieben"
 
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3102
-#: ../mail/em-folder-tree.c:1000 ../mail/message-list.c:2067
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "_Ziehen abbrechen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "Anlage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2486
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "Termin bearbeiten"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "Besprechung - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "Termin - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Zugewiesene Aufgabe - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "Aufgabe - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "Notiz - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "Keine Zusammenfassung"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "Klicken Sie hier, um das momentan geöffnete Fenster zu schließen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "Den markierten Text in die Zwischenablage kopieren"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "Den markierten Text in die Zwischenablage verschieben"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "Klicken Sie hier, um die verfügbare Hilfe anzuzeigen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "Den in der Zwischenablage befindlichen Text einfügen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "Klicken Sie hier, um das momentan geöffnete Fenster zu speichern"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "Den gesamten Text markieren"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "E_instufung"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
+msgid "_File"
+msgstr "_Datei"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:45
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "Ein_fügen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "_Optionen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:54
+msgid "_View"
+msgstr "_Ansicht"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_Anlage …"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "Klicken Sie hier, um eine Datei beizulegen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "_Kategorien"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "Kategorien anzeigen/verbergen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "Zeit_zone"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "Zeitzone anzeigen/verbergen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "Ö_ffentlich"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "Als öffentlich einstufen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "_Privat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "Als privat einstufen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "Ver_traulich"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "Als vertraulich einstufen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "_Positions-Feld"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "Feld für die Position angezeigen/verbergen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "_UAwg"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "UAwg-Feld angezeigen/verbergen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "_Statusfeld"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "Statusfeld anzeigen/verbergen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "A_rt-Feld"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Feld für die Teilnehmerart angezeigen/verbergen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+#, fuzzy
+msgid "Recent Docu_ments"
+msgstr "Prozent abgeschlossen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "Beilegen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Anlage"
 msgstr[1] "<b>%d</b> Anlagen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "Anla_genleiste verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "Anla_genleiste anzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3636
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
-#: ../composer/e-msg-composer.c:3639
+#: ../calendar/gui/dialogs/comp-editor.c:2036
+#: ../composer/e-msg-composer.c:1049
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "Anlage _hinzufügen …"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../mail/em-format-html-display.c:2196
 msgid "Show Attachments"
 msgstr "Anlagen anzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr ""
 "Durch Drücken der Leertaste wird die Anlagenleiste ein bzw. ausgeblendet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-msgid "Edit Appointment"
-msgstr "Termin bearbeiten"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-#, c-format
-msgid "Meeting - %s"
-msgstr "Besprechung - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
-#, c-format
-msgid "Appointment - %s"
-msgstr "Termin - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Zugewiesene Aufgabe - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Task - %s"
-msgstr "Aufgabe - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
-#, c-format
-msgid "Memo - %s"
-msgstr "Notiz - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
-msgid "No summary"
-msgstr "Keine Zusammenfassung"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "An diesem Objekt vorgenommene Änderungen verfallen möglicherweise, sobald "
 "Aktualisierungen eintreffen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "Aktuelle Version konnte nicht verwendet werden!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "Quelle konnte nicht geöffnet werden"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "Ziel konnte nicht geöffnet werden"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "Ziel ist nur lesbar"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:202
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "Soll dieses Objekt von allen anderen Postfächern der Empfänger ge_löscht "
 "werden?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:53
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 "Das Ereignis konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The task could not be deleted due to a corba error"
 msgstr "Die Aufgabe konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Die Notiz konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:62
 msgid "The item could not be deleted due to a corba error"
 msgstr "Das Objekt konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:69
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 "Das Ereignis konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 "Die Aufgabe konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The memo could not be deleted because permission was denied"
 msgstr ""
 "Diese Notiz konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 "Das Objekt konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:85
 msgid "The event could not be deleted due to an error"
 msgstr "Das Ereignis konnte auf Grund eines Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:88
 msgid "The task could not be deleted due to an error"
 msgstr "Die Aufgabe konnte auf Grund eines Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:91
 msgid "The memo could not be deleted due to an error"
 msgstr "Die Notiz konnte auf Grund eines Fehlers nicht gelöscht werden"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:94
 msgid "The item could not be deleted due to an error"
 msgstr "Das Objekt konnte auf Grund eines Fehlers nicht gelöscht werden"
 
@@ -6241,7 +6606,7 @@ msgid "Contacts..."
 msgstr "Kontakte …"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To:"
 msgstr "Delegieren an:"
 
@@ -6249,135 +6614,181 @@ msgstr "Delegieren an:"
 msgid "Enter Delegate"
 msgstr "Delegaten eingeben"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "_Alarme"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr "Klicken Sie hier, um Alarme für dieses Ereignis einzustellen"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "_Wiederholung"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "Dies zu einem wiederkehrenden Ereignis machen"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Versandoptionen"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "Erweiterte Versandoptionen einfügen"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "_Ganztägiges Ereignis"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "Festlegen, ob es ein ganztägiges Ereinis ist"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "Zeit als b_eschäftigt anzeigen"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "Festlegen, ob die Zeit als beschäftigt angezeigt wird"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "_Verfügbarkeit"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "Verfügbarkeitsinformationen der Teilnehmer abfragen"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "_Termin"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Wiederholung"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "Dieses Ereignis enthält Alarme"
 
-#: ../calendar/gui/dialogs/event-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "_Delegaten"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "Teil_nehmer"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "Ereignis ohne Anfangsdatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "Ereignis ohne Enddatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "Das Enddatum ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "Die Anfangszeit ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "Die Endzeit ist falsch"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "Dem gewählten Organisator ist kein Konto mehr zugeordnet."
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Hinzufügen"
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Der Kalender »%s« konnte nicht geöffnet werden."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Sie handeln im Namen von %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d Tag vor dem Termin"
 msgstr[1] "%d Tage vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d Stunde vor dem Termin"
 msgstr[1] "%d Stunden vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d Minute vor dem Termin"
 msgstr[1] "%d Minuten vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "Anpassen"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:943
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2024
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../plugins/itip-formatter/itip-formatter.c:2022
+#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-signature-combo-box.c:69
 msgid "None"
 msgstr "Keine"
 
@@ -6449,28 +6860,24 @@ msgstr "Organisa_tor ändern"
 msgid "Co_ntacts..."
 msgstr "Ko_ntakte …"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Organisator"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2448
 msgid "Memo"
 msgstr "Notiz"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Notizen in »%s« konnten nicht geöffnet werden."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1549
-#: ../mail/em-format-html.c:1607 ../mail/em-format-html.c:1633
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "An"
 
@@ -6488,66 +6895,66 @@ msgid "_Description:"
 msgstr "_Beschreibung:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 "Sie nehmen Änderungen an einem wiederkehrenden Ereignis vor. Was möchten Sie "
 "verändern?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 "Sie delegieren ein wiederkehrendes Ereignis. Was möchten Sie delegieren?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 "Sie nehmen Änderungen an einer wiederkehrenden Aufgabe vor. Was möchten Sie "
 "verändern?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 "Sie nehmen Änderungen an einer wiederkehrenden Notiz vor. Was möchten Sie "
 "verändern?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "Nur diese Instanz"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "Diese und frühere Instanzen"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "Diese und zukünftige Instanzen"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "Alle Instanzen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Dieser Termin enthält Wiederholungen, die Evolution nicht bearbeiten kann."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "Das Wiederholungsdatum ist ungültig"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "am"
 
@@ -6555,7 +6962,7 @@ msgstr "am"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "erster"
 
@@ -6564,7 +6971,7 @@ msgstr "erster"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "zweiter"
 
@@ -6572,7 +6979,7 @@ msgstr "zweiter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "dritter"
 
@@ -6580,7 +6987,7 @@ msgstr "dritter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "vierter"
 
@@ -6588,13 +6995,13 @@ msgstr "vierter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "letzter"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Anderes Datum"
 
@@ -6602,7 +7009,7 @@ msgstr "Anderes Datum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1. bis 10."
 
@@ -6610,7 +7017,7 @@ msgstr "1. bis 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11. bis 20."
 
@@ -6618,45 +7025,45 @@ msgstr "11. bis 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "21. bis 31."
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "Tag"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "am"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "Treffer"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Ausnahme hinzufügen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Keine zu verändernde Auswahl vorhanden."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Ausnahme verändern"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Keine zu löschende Auswahl vorhanden."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Datum/Zeit"
 
@@ -6707,12 +7114,12 @@ msgstr "Woche(n)"
 msgid "year(s)"
 msgstr "Jahr(e)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "Das Fertigstellungsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "Website"
 
@@ -6727,51 +7134,55 @@ msgstr "<b>Status</b>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/print.c:2520 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "Abgeschlossen"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Hoch"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2517
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Niedrig"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2514
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Nicht begonnen"
 
@@ -6784,7 +7195,7 @@ msgid "Stat_us:"
 msgstr "Stat_us:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Nicht festgelegt"
 
@@ -6801,25 +7212,40 @@ msgstr "_Priorität:"
 msgid "_Web Page:"
 msgstr "_Website:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "S_tatusdetails"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+#, fuzzy
+msgid "Click to change or view the status details of the task"
+msgstr ""
+"Klicken Sie hier, um die Statusdetails der Aufgabe anzusehen oder zu ändern"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "_Versandoptionen"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/tasks-component.c:1326
 msgid "_Task"
 msgstr "_Aufgabe"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Aufgabendetails"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "Das Fälligkeitsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Aufgaben in »%s« konnten nicht geöffnet werden."
@@ -6845,7 +7271,7 @@ msgid "_Due date:"
 msgstr "_Fällig am:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6853,142 +7279,126 @@ msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d Woche"
 msgstr[1] "%d Wochen"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "Auszuführende Aktion unbekannt"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s vor Terminbeginn"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s nach Terminbeginn"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s zum Terminbeginn"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s vor Terminende"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s nach Terminende"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s zum Terminende"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s at %s"
 msgstr "%s um %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s für einen unbekannten Auslösertyp."
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicken Sie hier, um %s zu öffnen"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:160
-#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
-#: ../shell/e-shell-folder-title-bar.c:593
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:856
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:212
-#: ../calendar/gui/e-cal-component-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
 msgstr "Anfangsdatum:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:225
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-itip-control.c:1201
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-itip-control.c:1218
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:261
-#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "Website:"
 
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-cal-component-preview.c:210
+#: ../calendar/gui/e-itip-control.c:1162
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Fällig am:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Priorität:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Öffentlich"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Privat"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Vertraulich"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Enddatum"
@@ -6998,21 +7408,14 @@ msgstr "Enddatum"
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "Summary"
-msgstr "Zusammenfassung"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Frei"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Beschäftigt"
 
@@ -7027,34 +7430,34 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:746
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:165
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nein"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1329
+#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
+#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2049
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -7066,159 +7469,188 @@ msgstr "Wiederkehrend"
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:427
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
 msgid "Save As..."
 msgstr "Speichern unter …"
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2030
 msgid "Select folder to save selected attachments..."
 msgstr "Ordner zum Speichern der gewählten Anlagen auswählen …"
 
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:455
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
 #, c-format
 msgid "untitled_image.%s"
 msgstr "namenloses_bild.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:572 ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "_Speichern unter …"
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:573
-#: ../mail/em-popup.c:584
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
+#: ../mail/em-popup.c:574
 msgid "Set as _Background"
 msgstr "Zum _Hintergrund machen"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "Auswahl _speichern"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:830
+#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
 #, c-format
 msgid "Open in %s..."
 msgstr "In %s öffnen …"
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+#, fuzzy
+msgid "* No Summary *"
+msgstr "Keine Zusammenfassung"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organisator: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:377
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organisator: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+#, fuzzy
+msgid "Start: "
+msgstr "Anfang"
+
+#: ../calendar/gui/e-calendar-table.c:420
+#, fuzzy
+msgid "Due: "
+msgstr "Fällig am "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Gewählte Objekte werden gelöscht"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:807 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1233 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-msg-composer.c:1472
+#: ../calendar/gui/e-calendar-table.c:1348
+#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "Speichern unter …"
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "Neue _Aufgabe"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "_Website öffnen"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1669 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "_Drucken …"
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1689 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Ausschneiden"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "E_infügen"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Aufgabe zuweisen"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "Als i_Calendar weiterleiten"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Gewählte Aufgaben als abgeschlossen _markieren"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "Gewählte Aufgaben als abgeschlossen _markieren"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "Gewählte Aufgaben _löschen"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klicken Sie hier, um eine Aufgabe hinzuzufügen"
@@ -7241,7 +7673,8 @@ msgid "Due date"
 msgstr "Fällig am"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "Priorität"
 
@@ -7249,112 +7682,93 @@ msgstr "Priorität"
 msgid "Start date"
 msgstr "Anfangsdatum"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Status"
-
-#: ../calendar/gui/e-calendar-view.c:1352
+#: ../calendar/gui/e-calendar-view.c:1349
 msgid "Moving items"
 msgstr "Objekte werden verschoben"
 
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1351
 msgid "Copying items"
 msgstr "Objekte werden kopiert"
 
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New _Appointment..."
 msgstr "Neuer _Termin …"
 
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1661
 msgid "New All Day _Event"
 msgstr "Neues _ganztägiges Ereignis"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1662
 msgid "New _Meeting"
 msgstr "Neue Bes_prechung"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "_Current View"
 msgstr "_Aktuelle Ansicht"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1675
 msgid "Select T_oday"
 msgstr "_Heute wählen"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1676
 msgid "_Select Date..."
 msgstr "_Datum wählen …"
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Pri_nt..."
 msgstr "_Drucken …"
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "Cop_y to Calendar..."
 msgstr "In Kalender k_opieren …"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Mo_ve to Calendar..."
 msgstr "In Kalender _verschieben …"
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Delegate Meeting..."
 msgstr "Besprechung dele_gieren …"
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen …"
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten …"
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1697
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:577 ../mail/em-popup.c:588
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
+#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Antw_ort an alle"
 
-#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-calendar-view.c:1703
 msgid "Make this Occurrence _Movable"
 msgstr "Diese Wiederholung v_erschiebbar machen"
 
-#: ../calendar/gui/e-calendar-view.c:1707 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "_Diese Wiederholung löschen"
 
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1705
 msgid "Delete _All Occurrences"
 msgstr "_Termin inkl. Wiederholungen löschen"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2208
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organisator: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2212
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organisator: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2477
 #, c-format
 msgid "Location: %s"
 msgstr "Ort: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "Zeit: %s %s"
@@ -7382,7 +7796,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:583
+#: ../calendar/gui/e-day-view-time-item.c:589
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i Minuten-Unterteilungen"
@@ -7393,44 +7807,34 @@ msgstr "%02i Minuten-Unterteilungen"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:837 ../calendar/gui/e-day-view.c:1528
-#: ../calendar/gui/e-week-view-main-item.c:322 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:772 ../calendar/gui/e-week-view.c:511
+#: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
 #: ../calendar/gui/print.c:813
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:775 ../calendar/gui/e-week-view.c:514
+#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
 #: ../calendar/gui/print.c:815
 msgid "pm"
 msgstr "PM"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (Komplexe Wiederholung)."
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Täglich"
 msgstr[1] "Alle %d Tage"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
@@ -7438,9 +7842,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "Wöchentlich"
 msgstr[1] "Alle %d Wochen"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7448,52 +7850,36 @@ msgstr[0] "Wöchentlich am "
 msgstr[1] "Alle %d Wochen am "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " und "
 
 # CHECK - muss mit erste(r), zweite(r) usw. übereinstimmen
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "%s Tag des "
 
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s des "
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "monatlich"
 msgstr[1] "alle %d Monate"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Jährlich"
 msgstr[1] "Alle %d Jahre"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7502,47 +7888,47 @@ msgstr[1] " insgesamt %d Mal"
 
 # CHECK
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", endet am "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Anfang"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "Ende"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "Fällig"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "iCalendar-Informationen"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "iCalendar-Fehler"
 
-#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
-#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:521
+#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1126
+#: ../calendar/gui/e-itip-control.c:1143
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7550,28 +7936,28 @@ msgstr ""
 "<br> Bitte sehen Sie sich die folgenden Informationen noch einmal an und "
 "wählen Sie dann eine Aktion aus untenstehendem Menü."
 
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/itip-utils.c:728
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/itip-utils.c:664
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2040
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
-#: ../plugins/itip-formatter/itip-formatter.c:2043
+#: ../calendar/gui/e-itip-control.c:1199
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: ../calendar/gui/e-itip-control.c:1266
+#: ../calendar/gui/e-itip-control.c:1283
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
@@ -7579,269 +7965,269 @@ msgstr ""
 "Die Besprechung wurde abgesagt, konnte jedoch nicht in Ihren Kalendern "
 "gefunden werden"
 
-#: ../calendar/gui/e-itip-control.c:1268
+#: ../calendar/gui/e-itip-control.c:1285
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "Die Aufgabe wurde abgesagt, konnte jedoch nicht in Ihren Aufgabenlisten "
 "gefunden werden"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> hat Besprechungsinformationen veröffentlicht."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Besprechungsinformationen"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1370
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> wünscht die Teilnahme von %s an einer Besprechung."
 
-#: ../calendar/gui/e-itip-control.c:1355
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> wünscht Ihre Teilnahme an einer Besprechung."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Besprechungsvorschlag"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr ""
 "<b>%s</b> wünscht zu einer existierenden Besprechung hinzugefügt zu werden."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Besprechungsaktualisierung"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wünscht aktuelle Besprechungsinformationen zu erhalten."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Besprechungs-Aktualisierungsanfrage"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> hat auf eine Besprechungsanfrage geantwortet."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Besprechungsantwort"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> hat eine Besprechung abgesagt."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Besprechungsabsage"
 
-#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1528
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> hat eine unverständliche Nachricht verschickt."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Fehlerhafte Besprechungsmitteilung"
 
-#: ../calendar/gui/e-itip-control.c:1422
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> hat Aufgabeninformationen veröffentlicht."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Aufgabeninformationen"
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1447
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> wünscht, dass %s eine Aufgabe auszuführt."
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> wünscht, dass Sie eine Aufgabe ausführen."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Aufgabenvorschlag"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> wünscht zu einer bestehenden Aufgabe hinzugefügt zu werden."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Aufgabenaktualisierung"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wünscht aktuelle Aufgabeninformationen zu erhalten."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Aufgaben-Aktualisierungsanfrage"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> hat auf eine Aufgabenzuweisung geantwortet."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Aufgaben-Antwort"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> hat eine Aufgabe abgesagt."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "Aufgabenabsage"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Fehlerhafte Aufgabenmitteilung"
 
-#: ../calendar/gui/e-itip-control.c:1496
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> hat Verfügbarkeitsinformationen veröffentlicht."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: ../calendar/gui/e-itip-control.c:1501
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> fordert Ihre Verfügbarkeitsinformationen an."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Verfügbarkeitsanfrage"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> hat auf eine Verfugbarkeitsanfrage geantwortet."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Verfügbarkeitsantwort"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Fehlerhafte Verfügbarkeitsmitteilung"
 
-#: ../calendar/gui/e-itip-control.c:1588
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message does not appear to be properly formed"
 msgstr "Diese Nachricht scheint falsch formatiert zu sein"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "Diese Nachricht enthält ausschließlich nicht unterstützte Anfragen."
 
-#: ../calendar/gui/e-itip-control.c:1680
+#: ../calendar/gui/e-itip-control.c:1697
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Die Anlage enthält keine gültige Kalendernachricht"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "Die Anlage hat keine anzeigbaren Kalendereinträge"
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt ist ungültig und konnte nicht aktualisiert werden\n"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Diese Antwort stammt von keinem voraussichtlichen Teilnehmer.  Als "
 "Teilnehmer hinzufügen?"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Teilnahmestatus konnte auf Grund eines ungültigen Status nicht aktualisiert "
 "werden!\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "Teilnahmestatus aktualisiert\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
+#: ../calendar/gui/e-itip-control.c:2080
 #: ../plugins/itip-formatter/itip-formatter.c:1254
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Teilnahmestatus konnte nicht aktualisiert werden, da der Eintrag nicht mehr "
 "existiert"
 
-#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Eine Aktion wählen:"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: ../calendar/gui/e-itip-control.c:2332
+#: ../calendar/gui/e-itip-control.c:2355
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Annehmen"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Vorläufig annehmen"
 
-#: ../calendar/gui/e-itip-control.c:2334
+#: ../calendar/gui/e-itip-control.c:2357
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen übermitteln"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Status des Antwortenden aktualisieren"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Neueste Informationen übermitteln"
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -7870,112 +8256,112 @@ msgstr "Kalender wird geladen …"
 msgid "Server Message:"
 msgstr "Server-Nachricht:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Vorsitzende"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Benötigte Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Optionale Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Ressourcen"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:965
 msgid "Individual"
 msgstr "Individuell"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
 #: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
 #: ../calendar/gui/print.c:967
 msgid "Resource"
 msgstr "Ressource"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
 #: ../calendar/gui/print.c:968
 msgid "Room"
 msgstr "Raum"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
 #: ../calendar/gui/print.c:982
 msgid "Chair"
 msgstr "Vorsitzender"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/e-meeting-store.c:746 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:983
 msgid "Required Participant"
 msgstr "Benötigter Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
 #: ../calendar/gui/print.c:984
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
 #: ../calendar/gui/print.c:985
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:756
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:753
 msgid "Needs Action"
 msgstr "Erfordert Maßnahme"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Tentative"
 msgstr "Vorläufig"
 
-#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/itip-utils.c:737
-#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/itip-utils.c:673
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "Delegiert"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:484
+#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr "Teilnehmer"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../calendar/gui/e-meeting-list-view.c:533
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "UAwg"
 
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
 msgstr "In Bearbeitung"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:473
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%a, %d. %B %Y"
 
@@ -7983,85 +8369,81 @@ msgstr "%a, %d. %B %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:481
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "Nicht im Büro"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "Keine Informationen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "_Teilnehmer …"
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "_Einstellungen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "Nur _Arbeitszeit anzeigen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "Ver_kleinert anzeigen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "Verfügbarkeit _aktualisieren"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "_Auto-Auswählen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "_Alle Personen und Ressourcen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "Alle _Personen und eine Ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "_Benötigte Personen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "Benötigte Personen und _eine Ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "_Anfangszeit:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "_Endzeit:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Teilnehmer"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Klicken Sie hier, um einen Teilnehmer hinzuzufügen"
@@ -8094,8 +8476,8 @@ msgstr "Gewählte Notizen _löschen"
 msgid "Click to add a memo"
 msgstr "Klicken Sie hier, um eine Notiz hinzuzufügen"
 
-#: ../calendar/gui/e-memos.c:791 ../calendar/gui/e-tasks.c:923
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/gnome-cal.c:2864
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8104,84 +8486,84 @@ msgstr ""
 "Fehler bei »%s«:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:840
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "Notizen werden geladen"
 
-#: ../calendar/gui/e-memos.c:921
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Notizen unter %s werden geöffnet"
 
-#: ../calendar/gui/e-memos.c:1094 ../calendar/gui/e-tasks.c:1334
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "Gewählte Objekte werden gelöscht …"
 
-#: ../calendar/gui/e-tasks.c:976
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "Aufgaben werden geladen"
 
-#: ../calendar/gui/e-tasks.c:1066
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben unter %s werden geöffnet"
 
-#: ../calendar/gui/e-tasks.c:1311
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "Aufgaben werden abgeschlossen …"
 
-#: ../calendar/gui/e-tasks.c:1361
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "Wird gesäubert"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:130
 msgid "Select Timezone"
 msgstr "Zeitzone auswählen"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:339 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1637
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../calendar/gui/gnome-cal.c:828
+#: ../calendar/gui/gnome-cal.c:830
 msgid "Updating query"
 msgstr "Abfrage wird aktualisiert"
 
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2501
 msgid "_Custom View"
 msgstr "Be_nutzerdefinierte Ansicht"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2502
 msgid "_Save Custom View"
 msgstr "Benutzerdefinierte Ansicht _speichern"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2507
 msgid "_Define Views..."
 msgstr "Ansichten _definieren …"
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2688
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Termine unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2707
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Aufgaben unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2716
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Notizen unter %s werden geladen"
 
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2823
 #, c-format
 msgid "Opening %s"
 msgstr "%s wird geöffnet …"
 
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3779
 msgid "Purging"
 msgstr "Säuberungsvorgang"
 
@@ -8241,139 +8623,144 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Heute wählen"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../calendar/gui/itip-utils.c:544
 msgid "An organizer must be set."
 msgstr "Es muss ein Organisator festgelegt werden."
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "Es ist mindestens ein Teilnehmer erforderlich"
 
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "Ereignisinformationen"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Aufgabeninformationen"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "Notiz-Informationen"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Kalenderinformationen"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Auffrischen"
 
 # CHECK
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Gegenvorschlag"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Verfügbarkeitsinformationen (%s bis %s)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iCalendar-Informationen"
 
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:465
 msgid "_New Memo List"
 msgstr "_Neue Notizliste"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:545
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d Notiz"
 msgstr[1] "%d Notizen"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d gewählt"
 msgstr[1] ", %d gewählt"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:594
 msgid "Failed upgrading memos."
 msgstr "Auffrischen der Notizen gescheitert."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:954
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Die Notizliste »%s« konnte nicht zum Anlegen von Ereignissen und Terminen "
 "geöffnet werden"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:967
 msgid "There is no calendar available for creating memos"
 msgstr "Es ist kein Kalender zum Anlegen von Notizen verfügbar"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1077
 msgid "Memo Source Selector"
 msgstr "Notizquellenauswahl"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Neue Notiz"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
 msgid "Mem_o"
 msgstr "N_otiz"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Eine neue Notiz anlegen"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Neue gemeinsame Notiz"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
 msgid "_Shared memo"
 msgstr "_Gemeinsame Notiz"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Eine neue gemeinsame Notiz anlegen"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Neue Notizliste"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
 msgid "Memo li_st"
 msgstr "Noti_zenliste"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Eine neue Notizliste anlegen"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
 msgstr "Notizen drucken"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+#, fuzzy
+msgid "Next 7 Days'"
+msgstr "Aufgaben der nächsten 7 Tage"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8385,7 +8772,7 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
 
-#: ../calendar/gui/migration.c:168
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8398,28 +8785,28 @@ msgstr ""
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:782 ../calendar/gui/migration.c:950
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 "Alte Einstellungen aus evolution/config.xmldb konnten nicht migiriert werden"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:811
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Der Kalender »%s« konnte nicht migriert werden."
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:979
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Die Aufgaben in »%s« konnten nicht migriert werden."
 
-#: ../calendar/gui/migration.c:1234
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
+#: ../calendar/gui/migration.c:1227
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
 msgid "Notes"
 msgstr "Notizen"
 
@@ -8627,69 +9014,69 @@ msgstr "Kontakte: "
 msgid "Upcoming Appointments"
 msgstr "Bevorstehende Termine"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:456
 msgid "_New Task List"
 msgstr "_Neue Aufgabenliste"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:536
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d Aufgabe"
 msgstr[1] "%d Aufgaben"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:585
 msgid "Failed upgrading tasks."
 msgstr "Auffrischen der Aufgaben gescheitert."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:942
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Die Aufgabenliste »%s« konnte nicht zum Anlegen von Ereignissen und Terminen "
 "geöffnet werden"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:955
 msgid "There is no calendar available for creating tasks"
 msgstr "Es ist kein Kalender zum Anlegen von Aufgaben verfügbar"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1066
 msgid "Task Source Selector"
 msgstr "Aufgabenquellenauswahl"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Neue Aufgabe"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Zugewiesene Aufgabe anlegen"
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1334
 msgid "Assigne_d Task"
 msgstr "_Zugewiesene Aufgabe"
 
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Eine neue zugewiesene Aufgabe anlegen"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Neue Aufgabenliste"
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1342
 msgid "Tas_k list"
 msgstr "Aufgabenl_iste"
 
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Eine neue Aufgabenliste anlegen"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../calendar/gui/tasks-control.c:452
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8702,49 +9089,70 @@ msgstr ""
 "\n"
 "Sollen die Aufgaben wirklich entfernt werden?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "Nicht mehr rückfragen."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Aufgaben drucken"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% abgeschlossen"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Abgebrochen"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "In Bearbeitung"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "ist größer als"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "ist kleiner als"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Termine und Besprechungen"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1583
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1578
 msgid "Opening calendar"
 msgstr "Kalender wird geöffnet"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-Dateien (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Evolution-iCalendar-Importeur"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "Erinnerung!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-Dateien (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Evolution-vCalendar-Importeur"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "Kalender-Ereignisse"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligenter Evolution-Kalender-Importeur"
 
@@ -10278,57 +10686,220 @@ msgstr "Pazifik/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pazifik/Yap"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
+#: ../composer/e-composer-autosave.c:275
+#, fuzzy
+msgid "Could not open autosave file"
+msgstr "Datei konnte nicht geöffnet werden"
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "Zielordner"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "Nachricht konnte nicht vom Editor abgerufen werden"
 
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "Wählen Sie Ordner, in denen die Nachricht abgelegt werden soll."
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "Anlage hinzufügen"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "Klicken Sie hier, um die Veröffentlichungsordner zu wählen"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "Bei_legen"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "Si_gnatur:"
+#: ../composer/e-composer-actions.c:143
+msgid "Untitled Message"
+msgstr "Namenlose Nachricht"
 
-#: ../composer/e-msg-composer-hdrs.c:326
-msgid "Fr_om:"
-msgstr "V_on:"
+#: ../composer/e-composer-actions.c:474
+msgid "Attach a file"
+msgstr "Eine Datei beilegen"
 
-#: ../composer/e-msg-composer-hdrs.c:332
-msgid "_Reply-To:"
-msgstr "Antwo_rt an:"
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "S_chließen"
 
-#: ../composer/e-msg-composer-hdrs.c:335
-msgid "_To:"
-msgstr "A_n:"
+#: ../composer/e-composer-actions.c:481
+msgid "Close the current file"
+msgstr "Die momentan geöffnete Datei schließen"
+
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "_Drucken …"
+
+#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "Druck_vorschau"
+
+#: ../composer/e-composer-actions.c:502
+msgid "Save the current file"
+msgstr "Die momentan geöffnete Datei speichern"
+
+#: ../composer/e-composer-actions.c:507
+msgid "Save _As..."
+msgstr "Speichern _unter …"
+
+#: ../composer/e-composer-actions.c:509
+msgid "Save the current file with a different name"
+msgstr "Die momentan geöffnete Datei unter einem anderem Namen speichern"
+
+#: ../composer/e-composer-actions.c:514
+msgid "Save _Draft"
+msgstr "_Entwurf speichern"
+
+#: ../composer/e-composer-actions.c:516
+msgid "Save as draft"
+msgstr "Als Entwurf speichern"
+
+#: ../composer/e-composer-actions.c:521
+msgid "S_end"
+msgstr "A_bschicken"
+
+#: ../composer/e-composer-actions.c:523
+msgid "Send this message"
+msgstr "Diese Nachricht verschicken"
+
+#: ../composer/e-composer-actions.c:530
+msgid "Insert Send options"
+msgstr "Versandoptionen einfügen"
+
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "Neue _Nachricht"
+
+#: ../composer/e-composer-actions.c:537
+#, fuzzy
+msgid "Open New Message window"
+msgstr "Neue Nachricht _schicken an …"
+
+#: ../composer/e-composer-actions.c:544
+msgid "Character _Encoding"
+msgstr "Zeichen_kodierung"
+
+#: ../composer/e-composer-actions.c:551
+msgid "_Security"
+msgstr "_Sicherheit"
+
+#: ../composer/e-composer-actions.c:561
+msgid "PGP _Encrypt"
+msgstr "Mit P_GP verschlüsseln"
+
+#: ../composer/e-composer-actions.c:563
+msgid "Encrypt this message with PGP"
+msgstr "Diese Nachricht mit PGP verschlüsseln"
+
+#: ../composer/e-composer-actions.c:569
+msgid "PGP _Sign"
+msgstr "Mit _PGP signieren"
+
+#: ../composer/e-composer-actions.c:571
+msgid "Sign this message with your PGP key"
+msgstr "Diese Nachricht mit PGP signieren"
+
+#: ../composer/e-composer-actions.c:577
+msgid "_Prioritize Message"
+msgstr "Nachricht _priorisieren"
+
+#: ../composer/e-composer-actions.c:579
+msgid "Set the message priority to high"
+msgstr "Die Priorität der Nachricht auf hoch setzen"
+
+#: ../composer/e-composer-actions.c:585
+msgid "Re_quest Read Receipt"
+msgstr "_Lesebestätigung anfordern"
+
+#: ../composer/e-composer-actions.c:587
+msgid "Get delivery notification when your message is read"
+msgstr ""
+"Eine Zustellungsbestätigung erhalten, sobald Ihre Nachricht gelesen wurde"
+
+#: ../composer/e-composer-actions.c:593
+msgid "S/MIME En_crypt"
+msgstr "Mit S/_MIME verschlüsseln"
+
+#: ../composer/e-composer-actions.c:595
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr ""
+"Diese Nachricht mit Ihrem S/MIME-Verschlüsselungszertifikat verschlüsseln"
+
+#: ../composer/e-composer-actions.c:601
+msgid "S/MIME Sig_n"
+msgstr "Mit _S/MIME signieren"
+
+#: ../composer/e-composer-actions.c:603
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Diese Nachricht mit Ihrem S/MIME-Signaturzertifikat signieren"
+
+#: ../composer/e-composer-actions.c:609
+msgid "_Bcc Field"
+msgstr "_Blindkopie-Feld"
+
+#: ../composer/e-composer-actions.c:611
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Blindkopie-Feld anzeigen/verbergen"
+
+#: ../composer/e-composer-actions.c:617
+msgid "_Cc Field"
+msgstr "_Kopie-Feld"
 
-#: ../composer/e-msg-composer-hdrs.c:337
+#: ../composer/e-composer-actions.c:619
+msgid "Toggles whether the CC field is displayed"
+msgstr "Kopie-Feld anzeigen/verbergen"
+
+#: ../composer/e-composer-actions.c:625
+msgid "_From Field"
+msgstr "_Von-Feld"
+
+#: ../composer/e-composer-actions.c:627
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Von-Wähler anzeigen/verbergen"
+
+#: ../composer/e-composer-actions.c:633
+msgid "_Post-To Field"
+msgstr "V_eröffentlichen-in-Feld"
+
+#: ../composer/e-composer-actions.c:635
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "Veröffentlichen-in-Feld anzeigen/verbergen"
+
+#: ../composer/e-composer-actions.c:641
+msgid "_Reply-To Field"
+msgstr "An_twort-an-Feld"
+
+#: ../composer/e-composer-actions.c:643
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Antwort-an-Feld anzeigen/verbergen"
+
+#: ../composer/e-composer-actions.c:649
+#, fuzzy
+msgid "_Subject Field"
+msgstr "_Kopie-Feld"
+
+#: ../composer/e-composer-actions.c:651
+#, fuzzy
+msgid "Toggles whether the Subject field is displayed"
+msgstr "Statusfeld anzeigen/verbergen"
+
+#: ../composer/e-composer-actions.c:657
+msgid "_To Field"
+msgstr "A_n-Feld"
+
+#: ../composer/e-composer-actions.c:659
+msgid "Toggles whether the To field is displayed"
+msgstr "An-Feld anzeigen/verbergen"
+
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Geben Sie die Empfänger der Nachricht ein"
 
-#: ../composer/e-msg-composer-hdrs.c:340
-msgid "_Cc:"
-msgstr "_Kopie an:"
-
-#: ../composer/e-msg-composer-hdrs.c:342
+#: ../composer/e-composer-header-table.c:68
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
 
-#: ../composer/e-msg-composer-hdrs.c:346
-msgid "_Bcc:"
-msgstr "Blindko_pie an:"
-
-#: ../composer/e-msg-composer-hdrs.c:348
+#: ../composer/e-composer-header-table.c:71
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10336,30 +10907,71 @@ msgstr ""
 "Geben Sie die Adressen ein, die eine Kopie erhalten, jedoch nicht in der "
 "Empfängerliste auftauchen sollen"
 
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr "V_on:"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr "Antwo_rt an:"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "A_n:"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "_Kopie an:"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "Blindko_pie an:"
+
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "_Veröffentlichen in:"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "Be_treff:"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "Bei_legen"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "Si_gnatur:"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "Anlage hinzufügen"
+#: ../composer/e-composer-name-header.c:114
+msgid "Click here for the address book"
+msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
+
+#: ../composer/e-composer-post-header.c:136
+msgid "Posting destination"
+msgstr "Zielordner"
+
+#: ../composer/e-composer-post-header.c:137
+msgid "Choose folders to post the message to."
+msgstr "Wählen Sie Ordner, in denen die Nachricht abgelegt werden soll."
+
+#: ../composer/e-composer-post-header.c:171
+msgid "Click here to select folders to post to"
+msgstr "Klicken Sie hier, um die Veröffentlichungsordner zu wählen"
+
+#: ../composer/e-composer-private.c:65
+#, fuzzy
+msgid "Recent _Documents"
+msgstr "Prozent abgeschlossen"
+
+#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+msgid "Show _Attachment Bar"
+msgstr "Anla_genleiste anzeigen"
 
-#: ../composer/e-msg-composer.c:819
+#: ../composer/e-msg-composer.c:873
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Ausgehende Nachricht konnte nicht signiert werden: Kein Signaturzertifikat "
 "für dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:826
+#: ../composer/e-msg-composer.c:880
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10367,42 +10979,23 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht verschlüsselt werden: Kein "
 "Verschlüsselungszertifikat für dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2515
+#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1914
+#: ../mail/em-format-html-display.c:2404 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Anlage"
+msgstr[1] "Anlagen"
+
+#: ../composer/e-msg-composer.c:1557
 msgid "Hide _Attachment Bar"
 msgstr "Anla_genleiste verbergen"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2518
-#: ../composer/e-msg-composer.c:3884
-msgid "Show _Attachment Bar"
-msgstr "Anla_genleiste anzeigen"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "Unbekannter Grund"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "Datei konnte nicht geöffnet werden"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "Nachricht konnte nicht vom Editor abgerufen werden"
-
-#: ../composer/e-msg-composer.c:1819
-msgid "Untitled Message"
-msgstr "Namenlose Nachricht"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1855
-msgid "Open File"
-msgstr "Datei öffnen"
-
-#: ../composer/e-msg-composer.c:2529 ../composer/e-msg-composer.c:3764
-#: ../composer/e-msg-composer.c:3767
+#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
-#: ../composer/e-msg-composer.c:5037
+#: ../composer/e-msg-composer.c:4056
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10436,8 +11029,7 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 "Grund: »{0}«. Möglicherweise müssen Sie Ihre E-Mail-Einstellungen ändern."
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "Grund: »{1}«."
 
@@ -10562,7 +11154,7 @@ msgstr "Sie müssen ein Konto einrichten, bevor Sie E-Mails verfassen können."
 msgid "_Do not Recover"
 msgstr "_Verwerfen"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:317
+#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:306
 msgid "_Recover"
 msgstr "_Wiederherstellen"
 
@@ -10574,7 +11166,7 @@ msgstr "Nachricht _speichern"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution-E-Mail und -Kalender"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:753
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Groupware-Suite"
 
@@ -10590,49 +11182,75 @@ msgstr "Adresskarte"
 msgid "calendar information"
 msgstr "Kalenderinformationen"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Evolution-Fehler"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Evolution-Warnung"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Evolution-Informationen"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Evolution-Abfrage"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Interner Fehler, unbekannter Fehler »%s« angefordert"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:154
+msgid "Component"
+msgstr "Komponente"
+
+#: ../e-util/e-logger.c:155
+msgid "Name of the component being logged"
+msgstr ""
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../plugins/plugin-manager/plugin-manager.c:339
+#: ../plugins/publish-calendar/publish-calendar.c:689
+msgid "Enabled"
+msgstr "Aktiv"
+
+#: ../e-util/e-plugin.c:309
+#, fuzzy
+msgid "Whether the plugin is enabled"
+msgstr "Ist der Ausklapper ausgeklappt?"
+
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "Während des Druckens ist ein Fehler aufgetreten"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "Das Drucksystem hat folgende Details zum Fehler berichtet:"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:171
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
 "Das Drucksystem hat keine weiteren Details über den aufgetretenen Fehler "
 "berichtet."
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#, fuzzy
+msgid "Because \"{1}\"."
+msgstr "Grund: »{1}«."
+
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
+msgid "Cannot open file \"{0}\"."
 msgstr "Die Datei »{0}« konnte nicht geöffnet werden."
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
 msgstr "Die Datei »{0}« konnte nicht gespeichert werden."
 
 #: ../e-util/e-system.error.xml.h:4
@@ -10640,7 +11258,7 @@ msgid "Do you wish to overwrite it?"
 msgstr "Soll sie überschrieben werden?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
+msgid "File exists \"{0}\"."
 msgstr "Die Datei »{0}« existiert bereits."
 
 #: ../e-util/e-system.error.xml.h:6
@@ -10651,52 +11269,63 @@ msgstr "Datei überschreiben?"
 msgid "_Overwrite"
 msgstr "Ü_berschreiben"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "_Wichtig"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "_Geschäftlich"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "_Persönlich"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "Zu er_ledigen"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "S_päter"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "_Beschriftungsname:"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "Beschriftung bearbeiten"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "Beschriftung hinzufügen"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "Beschriftungsname darf nicht leer sein."
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
+#: ../e-util/e-util-labels.c:356
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
 msgstr ""
 "Beschriftung mit der gleichen Markierung existiert bereits. Bitte geben Sie "
 "der Beschriftung einen anderen Namen."
 
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf-Fehler: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr ""
+
 #: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
@@ -10813,66 +11442,66 @@ msgstr "%d.%m.%Y"
 msgid "Select a time to compare against"
 msgstr "Wählen Sie eine Vergleichszeit"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Eine Datei wählen"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:851
 msgid "R_ule name:"
 msgstr "Regel_name:"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:879
 msgid "Find items that meet the following criteria"
 msgstr "Objekte suchen, die folgenden Kriterien entsprechen"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:913
 msgid "A_dd Filter Criteria"
 msgstr "Filter_kriterien hinzufügen"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:919
 msgid "If all criteria are met"
 msgstr "Falls alle Kriterien zutreffen"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:919
 msgid "If any criteria are met"
 msgstr "Falls irgendein Kriterium zutrifft"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:921
 msgid "_Find items:"
 msgstr "Objekte _suchen:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "All related"
 msgstr "Alle mit Bezug"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "Replies"
 msgstr "Antworten"
 
 # CHECK
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "Replies and parents"
 msgstr "Antworten und Vorgänger"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "No reply or parent"
 msgstr "Ohne Antwort oder Vorgänger"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:945
 msgid "I_nclude threads"
 msgstr "_Threads einschließen"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1043 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Eingang"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1043 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Ausgehend"
 
@@ -10896,7 +11525,7 @@ msgstr "Datum fehlt."
 msgid "Missing file name."
 msgstr "Dateiname fehlt."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Name fehlt."
 
@@ -10974,7 +11603,7 @@ msgstr "in der Zukunft"
 msgid "months"
 msgstr "Monate"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:193
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -10986,9 +11615,9 @@ msgstr "der aktuellen Zeit"
 msgid "the time you specify"
 msgstr "die von Ihnen angegebene Zeit"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:404
 msgid "weeks"
 msgstr "Wochen"
 
@@ -11004,7 +11633,7 @@ msgstr "Regel hinzufügen"
 msgid "Edit Rule"
 msgstr "Regel bearbeiten"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Regelname"
 
@@ -11063,16 +11692,16 @@ msgstr "Evolution-E-Mail-Einstellungsbedienelement"
 msgid "Evolution Network configuration control"
 msgstr "Bedienelement zur Konfiguration des Evolution-Kalenders"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:578 ../mail/mail-component.c:579
-#: ../mail/mail-component.c:743
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../mail/mail-component.c:593 ../mail/mail-component.c:594
+#: ../mail/mail-component.c:758
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "E-Mail"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:502
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "E-Mail-Konten"
 
@@ -11082,21 +11711,20 @@ msgid "Mail Preferences"
 msgstr "E-Mail-Einstellungen"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-#, fuzzy
 msgid "Network Preferences"
-msgstr "Editoreinstellungen"
+msgstr "Netzwerkeinstellungen"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "_E-Mail"
 
 # CHECK gibt's ne Übersetzung für diese Methode?
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s-Lizenzvereinbarung"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -11109,115 +11737,109 @@ msgstr ""
 " Lizenzvereinbarung für %s.\n"
 "Haken Sie das Kontrollkästchen ab, um sie zu akzeptieren.\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:97
 msgid "Autogenerated"
 msgstr "Automatisch erzeugt"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "Bei jeder Nachricht nachfragen"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identität"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Abrufen von E-Mails"
 
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2041
 msgid "Check for _new messages every"
 msgstr "_Automatisch nach neuen E-Mails sehen alle"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2049
 msgid "minu_tes"
 msgstr "Minu_ten"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Verschicken von E-Mails"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2282 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Vorgaben"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:130
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Sicherheit"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2385 ../mail/em-account-editor.c:2476
 msgid "Receiving Options"
 msgstr "Empfangsoptionen"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2386 ../mail/em-account-editor.c:2477
 msgid "Checking for New Messages"
 msgstr "Nach neuen E-Mails sehen"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Konteneditor"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Kontoassistent"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[Vorgabe]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:970
-#: ../plugins/plugin-manager/plugin-manager.c:331
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "Aktiv"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "Kontoname"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "Namenlose"
 
-#: ../mail/em-composer-prefs.c:976
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Sprache(n)"
 
-#: ../mail/em-composer-prefs.c:1019
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "Signaturskript hinzufügen"
 
-#: ../mail/em-composer-prefs.c:1039
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Signatur(en)"
 
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1750
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11225,11 +11847,11 @@ msgstr ""
 "Am ${WeekdayName}, den ${Day}.${Month}.${Year}, ${24Hour}:${Minute} "
 "${TimeZone} schrieb ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "_Filterregeln"
 
@@ -11246,10 +11868,6 @@ msgstr "Farbe zuweisen"
 msgid "Assign Score"
 msgstr "Bewertung zuweisen"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Anlagen"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
@@ -11266,10 +11884,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "Abgeschlossen am"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "enthält"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
@@ -11283,7 +11897,7 @@ msgid "Date sent"
 msgstr "Verschickt-Datum"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11294,10 +11908,6 @@ msgstr "Löschen"
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "enthält nicht"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "endet nicht auf"
@@ -11318,10 +11928,6 @@ msgstr "klingt nicht wie"
 msgid "does not start with"
 msgstr "beginnt nicht mit"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Existieren nicht"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Entwurf"
@@ -11330,10 +11936,6 @@ msgstr "Entwurf"
 msgid "ends with"
 msgstr "endet auf"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Existieren"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "existiert"
@@ -11346,14 +11948,10 @@ msgstr "Ausdruck"
 msgid "Follow Up"
 msgstr "Folgenachricht"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Wichtig"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "ist"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "ist nach"
@@ -11366,18 +11964,6 @@ msgstr "ist vor"
 msgid "is Flagged"
 msgstr "ist markiert"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "ist größer als"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "ist kleiner als"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "ist nicht"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "ist nicht markiert"
@@ -11399,7 +11985,7 @@ msgstr "Unerwünscht"
 msgid "Junk Test"
 msgstr "Unerwünscht-Test"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "Beschriftung"
 
@@ -11441,7 +12027,7 @@ msgstr "Klang abspielen"
 
 #. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Gelesen"
 
@@ -11513,10 +12099,9 @@ msgstr "beginnt mit"
 msgid "Stop Processing"
 msgstr "Verarbeitung stoppen"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1706
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:318
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11527,11 +12112,11 @@ msgid "Unset Status"
 msgstr "Status nicht setzen"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "Dann"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Aktion hin_zufügen"
 
@@ -11575,16 +12160,16 @@ msgstr "Wichtige Nachrichten"
 msgid "Messages Not Junk"
 msgstr "Nachrichten sind nicht unerwünscht"
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "Konto durchsuchen"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "Alle Konten durchsuchen"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:173
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Ungelesene Nachrichten:"
@@ -11592,31 +12177,37 @@ msgstr[1] "Ungelesene Nachrichten:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:177
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Nachrichten insgesamt:"
 msgstr[1] "Nachrichten insgesamt:"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+#, fuzzy
+msgid "Quota usage"
+msgstr "Nachrichten insgesamt:"
+
+#: ../mail/em-folder-properties.c:385
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Ordnereigenschaften"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<Klicken Sie hier, um einen Ordner auszuwählen>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "_Anlegen"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "Ordner_name:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Suchordner"
 
@@ -11626,27 +12217,27 @@ msgstr "Suchordner"
 msgid "UNMATCHED"
 msgstr "OHNE TREFFER"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Entwürfe"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2536
-#: ../mail/mail-component.c:157
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
+#: ../mail/em-folder-tree-model.c:507 ../mail/em-folder-tree.c:2556
+#: ../mail/mail-component.c:160
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
 msgid "Inbox"
 msgstr "Eingang"
 
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Ausgang"
 
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:160
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Verschickt"
 
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Ladevorgang …"
 
@@ -11665,87 +12256,79 @@ msgstr "Ladevorgang …"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:373
+#: ../mail/em-folder-tree.c:380
 #, c-format
 msgid "folder-display|%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:733
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "E-Mail-Ordnerbaum"
 
-#: ../mail/em-folder-tree.c:892
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Ordner %s wird verschoben"
 
-#: ../mail/em-folder-tree.c:894
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Ordner %s wird kopiert"
 
-#: ../mail/em-folder-tree.c:901 ../mail/message-list.c:1973
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s verschoben"
 
-#: ../mail/em-folder-tree.c:903 ../mail/message-list.c:1975
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s kopiert"
 
-#: ../mail/em-folder-tree.c:918
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Sie können Nachrichten nicht im Speicher auf der obersten Ebene abgelegen"
 
-#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "In Ordner _kopieren"
 
-#: ../mail/em-folder-tree.c:996 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "In Ordner _verschieben"
 
-#: ../mail/em-folder-tree.c:1705 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ordner in »%s« werden eingelesen"
 
-#: ../mail/em-folder-tree.c:2078 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Ansicht"
-
-#: ../mail/em-folder-tree.c:2079
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "In _neuem Fenster öffnen"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2084
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "Ordner a_nlegen …"
 
-#: ../mail/em-folder-tree.c:2087
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Verschieben …"
 
-#: ../mail/em-folder-tree.c:2094 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Umbenennen …"
 
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "Auf_frischen"
 
-#: ../mail/em-folder-tree.c:2096
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "E-Mails aus A_usgang verschicken"
 
-#: ../mail/em-folder-tree.c:2102 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Müll leeren"
 
@@ -11754,13 +12337,13 @@ msgstr "_Müll leeren"
 msgid "Copying `%s' to `%s'"
 msgstr "»%s« wird nach »%s« kopiert"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Ordner wählen"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
 msgid "C_opy"
 msgstr "K_opieren"
 
@@ -11782,207 +12365,199 @@ msgstr "Ordner anlegen"
 msgid "Specify where to create the folder:"
 msgstr "Angeben, wo der Ordner angelegt werden soll:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Löschen der E-Mail gescheitert"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Sie haben keine ausreichenden Rechte um diese E-Mail zu löschen."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:579 ../mail/em-popup.c:590
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "Als neue Nachricht _bearbeiten …"
 
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "_Drucken …"
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1348
 msgid "U_ndelete"
 msgstr "Löschen rü_ckgängig"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1349
 msgid "_Move to Folder..."
 msgstr "In Ordner verschie_ben …"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1350
 msgid "_Copy to Folder..."
 msgstr "In Ordner _kopieren …"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1353
 msgid "Mar_k as Read"
 msgstr "Als gelesen mar_kieren"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Unread"
 msgstr "Als u_ngelesen markieren"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Important"
 msgstr "Als w_ichtig markieren"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as Un_important"
 msgstr "Als un_wichtig markieren"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Junk"
 msgstr "Als u_nerwünscht markieren"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as _Not Junk"
 msgstr "Als _nicht unerwünscht markieren"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1359
 msgid "Mark for Follo_w Up..."
 msgstr "Als Folg_enachricht markieren …"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1361
 msgid "_Label"
 msgstr "Bes_chriftung"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Keine"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1365
 msgid "_New Label"
 msgstr "_Neue Beschriftung"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1369
 msgid "Fla_g Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1370
 msgid "Cl_ear Flag"
 msgstr "Markierung _löschen"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1373
 msgid "Crea_te Rule From Message"
 msgstr "Re_gel aus Nachricht anlegen"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1375
 msgid "Search Folder based on _Subject"
 msgstr "Suchordner über _Betreff"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1376
 msgid "Search Folder based on Se_nder"
 msgstr "Suchordner über Abse_nder"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1377
 msgid "Search Folder based on _Recipients"
 msgstr "Suchordner über _Empfänger"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1378
 msgid "Search Folder based on Mailing _List"
 msgstr "Suchordner über Mailing_liste"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1383
 msgid "Filter based on Sub_ject"
 msgstr "Filter über Be_treff"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1384
 msgid "Filter based on Sen_der"
 msgstr "Filter über Ab_sender"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1385
 msgid "Filter based on Re_cipients"
 msgstr "Filter über Em_pfänger"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1386
 msgid "Filter based on _Mailing List"
 msgstr "Filter über Ma_ilingliste"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
 msgid "Default"
 msgstr "Vorgabe"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "Nachricht konnte nicht abgerufen werden"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "Nachricht wird abgerufen …"
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "_Anrufen …"
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
 msgstr "_Suchordner anlegen"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "_Von dieser Adresse"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "_Zu dieser Adresse"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "Klicken Sie hier, um %s anzurufen"
 
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "Adressen anzeigen/verbergen"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:472
 #, c-format
 msgid "Matches: %d"
 msgstr "Passt auf: %d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:616
 msgid "Fin_d:"
 msgstr "_Suchen:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:640
 msgid "_Previous"
 msgstr "_Rückwärts suchen"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:645
 msgid "_Next"
 msgstr "_Weitersuchen"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:650
 msgid "M_atch case"
 msgstr "_Groß-/Kleinschreibung berücksichtigen"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Unsigniert"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11990,12 +12565,12 @@ msgstr ""
 "Diese Nachricht ist nicht signiert. Die Authentizität des Absenders ist "
 "daher nicht sichergestellt."
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:646
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Gültige Signatur"
 
 # CHECK
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12003,11 +12578,11 @@ msgstr ""
 "Diese Nachricht ist signiert und gültig. Es ist daher sehr wahrscheinlich, "
 "dass der Absender der ist, der er vorgibt zu sein."
 
-#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Ungültige Signatur"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12015,11 +12590,11 @@ msgstr ""
 "Die Signatur dieser Nachricht konnte nicht verifiziert werden. "
 "Möglicherweise wurde sie bei der Übertragung verändert."
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gültige Signatur, Absender konnte jedoch nicht verifiziert werden"
 
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12027,11 +12602,11 @@ msgstr ""
 "Diese Nachricht wurde mit einer gültigen Signatur signiert, der Absender der "
 "Nachricht konnte jedoch nicht verifiziert werden."
 
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Signatur existiert, jedoch wird der öffentliche Schlüssel benötigt"
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:953
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12039,11 +12614,11 @@ msgstr ""
 "Diese Nachricht wurde mit einer gültigen Signatur signiert, jedoch ist kein "
 "passender öffentlicher Schlüssel vorhanden."
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Nicht verschlüsselt"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12051,11 +12626,11 @@ msgstr ""
 "Diese Nachricht ist nicht verschlüsselt. Daher kann ihr Inhalt bei der "
 "Übertragung über das Internet möglicherweise ausgespäht werden."
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Schwach verschlüsselt"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:961
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12065,11 +12640,11 @@ msgstr ""
 "jedoch schwach. Daher können Dritte ihren Inhalt zwar nur schwerlich, jedoch "
 "nicht unmöglich innerhalb eines praktikablen Zeitraums ausspähen."
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:962
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12077,11 +12652,11 @@ msgstr ""
 "Diese Nachricht ist verschlüsselt. Daher können Dritte ihren Inhalt nur "
 "schwerlich ausspähen."
 
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Stark verschlüsselt"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:963
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12091,95 +12666,90 @@ msgstr ""
 "verschlüsselt. Daher können Dritte ihren Inhalt nur sehr schwerlich "
 "innerhalb eines praktikablen Zeitraums ausspähen."
 
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1064 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Zertifikat anzeigen"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1079
 msgid "This certificate is not viewable"
 msgstr "Dieses Zertifikat kann nicht angezeigt werden"
 
 # CHECK
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1372
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Fertiggestellt am %d. %B %Y, %R"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1380
 msgid "Overdue:"
 msgstr "Überfällig:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1383
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "am %d. %b, %k:%M"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1461
 msgid "_View Inline"
 msgstr "_Inline (eingebettet) anzeigen"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1462
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1463
 msgid "_Fit to Width"
 msgstr "In der Breite ein_passen"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1464
 msgid "Show _Original Size"
 msgstr "In _Originalgröße anzeigen"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Anlage"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1984
 msgid "Save attachment as"
 msgstr "Anlage speichern als"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1988
 msgid "Select folder to save all attachments"
 msgstr "Ordner zum Speichern aller Anlagen auswählen"
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2039
 msgid "_Save Selected..."
 msgstr "Gewählte _speichern …"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2106
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d A_nlage"
 msgstr[1] "%d A_nlagen"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2113 ../mail/em-format-html-display.c:2202
 msgid "S_ave"
 msgstr "_Speichern"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2124
 msgid "S_ave All"
 msgstr "_Alle speichern"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2198
 msgid "No Attachment"
 msgstr "Keine Anlagen"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2339 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "_Unformatierte ansehen"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2341
 msgid "Hide _Unformatted"
 msgstr "_Unformatierte verstecken"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2396
 msgid "O_pen With"
 msgstr "Ö_ffnen mit"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2467
 msgid ""
-"Evolution cannot render this email as it is too large to handle. You can "
+"Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
 "Evolution kann diese E-Mail nicht wiedergeben, da sie zu groß ist um sie zu "
@@ -12190,212 +12760,210 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: ../mail/em-format-html.c:499 ../mail/em-format-html.c:508
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "»%s« wird abgerufen"
 
-#: ../mail/em-format-html.c:920
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "Unbekannter external-body-Teil."
 
-#: ../mail/em-format-html.c:928
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "Fehlerhaft formatierter external-body-Teil."
 
-#: ../mail/em-format-html.c:958
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: ../mail/em-format-html.c:969
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Zeiger auf lokale Datei (%s) gültig auf Site »%s«"
 
-#: ../mail/em-format-html.c:971
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: ../mail/em-format-html.c:992
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Zeiger auf ferne Daten (%s)"
 
-#: ../mail/em-format-html.c:1003
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ »%s«)"
 
-#: ../mail/em-format-html.c:1231
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "Nachricht wird formatiert"
 
-#: ../mail/em-format-html.c:1398
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "Nachricht wird formatiert  …"
 
-#: ../mail/em-format-html.c:1550 ../mail/em-format-html.c:1614
-#: ../mail/em-format-html.c:1636 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Kopie"
 
-#: ../mail/em-format-html.c:1551 ../mail/em-format-html.c:1620
-#: ../mail/em-format-html.c:1639 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Blindkopie"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1710 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Mailer"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1737
+#: ../mail/em-format-html.c:1771
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1742
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1754 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "Datum"
-
-#: ../mail/em-format-html.c:1777 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-msgid "Newsgroups"
-msgstr "Newsgroups"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1870
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Diese Nachricht wurde von <b>%s</b> im Namen von <b>%s</b> gesendet"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:314
 msgid "From"
 msgstr "Von"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Antwort an"
 
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
+#: ../widgets/misc/e-dateedit.c:353
+msgid "Date"
+msgstr "Datum"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "Newsgroups"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1198
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 "Die Syntax der S/MIME-Nachricht konnte nicht analysiert werden: Unbekannter "
 "Fehler"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1335 ../mail/em-format.c:1491
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Die Syntax der MIME-Nachricht konnte nicht analysiert werden und wird daher "
 "als Quelltext angezeigt."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1343
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nicht unterstützter Verschlüsselungstyp für multipart/encrypted"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1353
 msgid "Could not parse PGP/MIME message"
 msgstr "Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1353
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr ""
 "Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden: "
 "Unbekannter Fehler"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1510
 msgid "Unsupported signature format"
 msgstr "Nicht unterstütztes Signaturformat"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1589
 msgid "Error verifying signature"
 msgstr "Fehler beim Verifizieren der Signatur"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1580 ../mail/em-format.c:1589
 msgid "Unknown error verifying signature"
 msgstr "Unbekannter Fehler beim Verifizieren der Signatur"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1661
 msgid "Could not parse PGP message"
 msgstr "Die Syntax der PGP-Nachricht konnte nicht analysiert werden"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1661
 msgid "Could not parse PGP message: Unknown error"
 msgstr ""
 "Die Syntax der PGP-Nachricht konnte nicht analysiert werden: Unbekannter "
 "Fehler"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "Jedes Mal"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "Einmal pro Tag"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "Einmal pro Woche"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "Einmal pro Monat"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "Benutzerdefinierte Unerwünscht-Kopfzeile hinzufügen"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "Name der Kopfzeile:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "Wert der Kopfzeile enthält:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "Enthält Wert"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "Farbe"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "Markierung"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s-Plugin ist verfügbar und das zugehörige Programm ist installiert."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
@@ -12403,74 +12971,92 @@ msgstr ""
 "%s-Plugin ist nicht verfügbar. Bitte prüfen Sie, ob das zugehörige "
 "Programmpaket installiert ist."
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "Kein Unerwünscht-Plugin verfügbar"
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Zu erledigen"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Später"
 
-#: ../mail/em-migrate.c:1211
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Der Speicherort und die Hierarchie der Evolution-E-Mail-Ordner hat sich seit "
-"Evolution 1.x verändert.\n"
-"\n"
-"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
+#: ../mail/em-migrate.c:1247
+#, fuzzy, c-format
+msgid "Migrating '%s':"
+msgstr "»%s« wird migriert:"
 
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Der Ordner »%s« konnte nicht angelegt werden: %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Der Ordner »%s« konnte nicht nach »%s« kopiert werden: %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "»%s« konnte nicht auf vorhandene Postfächer überprüft werden: %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../mail/em-migrate.c:1868
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Der Speicherort und die Hierarchie der Evolution-E-Mail-Ordner hat sich seit "
+"Evolution 1.x verändert.\n"
+"\n"
+"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Alte POP-Keep-on-Server-Daten »%s« konnten nicht geöffnet werden: %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "POP-Keep-on-Server-Datenverzeichnis »%s« konnte nicht angelegt werden: %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP-Keep-on-Server-Daten »%s« konnten nicht kopiert werden: %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Lokaler E-Mail-Speicher unter »%s« konnte nicht angelegt werden: %s"
 
-#: ../mail/em-migrate.c:2852
+#: ../mail/em-migrate.c:2898
+#, fuzzy
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Der Speicherort und die Hierarchie der Evolution-E-Mail-Ordner hat sich seit "
+"Evolution 1.x verändert.\n"
+"\n"
+"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Lokale E-Mail-Ordner unter »%s« konnten nicht angelegt werden: %s"
 
-#: ../mail/em-migrate.c:2871
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12478,64 +13064,66 @@ msgstr ""
 "Die Einstellungen der vorhandenen Evolution-Installation konnten nicht "
 "gelesen werden, »evolution/config.xmldb« existiert nicht oder ist fehlerhaft."
 
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 msgid "_Reply to sender"
 msgstr "_Antwort an Absender"
 
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Antwort an Lis_te"
 
 #. make it first item
-#: ../mail/em-popup.c:640 ../mail/em-popup.c:851
+#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
 msgid "_Add to Address Book"
 msgstr "Zum Adressbuch _hinzufügen"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Dieser Speicher unterstützt keine Abonnements oder sie sind nicht aktiviert."
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Ordner"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "Bitte wählen Sie einen Server."
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "Es wurde kein Server gewählt"
 
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "Diese _Meldung nicht mehr anzeigen."
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "Nachrichtenfilter"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "Nachricht"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "Nachricht speichern …"
 
-#: ../mail/em-utils.c:692
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "Adresse hinzufügen"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1213
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "Nachrichten von %s"
@@ -12549,57 +13137,71 @@ msgid "Search Folder source"
 msgstr "Suchordner-Quelle"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+#, fuzzy
+msgid "\"Send and Receive Mail\" window height"
+msgstr "E-Mails verschicken und abrufen"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:3
+#, fuzzy
+msgid "\"Send and Receive Mail\" window width"
+msgstr "E-Mails verschicken und abrufen"
+
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
 msgstr "Erlaubt Evolution Textteile von begrenzter Größe anzuzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Lesebestätigung immer anfordern"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 "Anzahl der Sekunden, die eine Fehlermeldung in der Statusleiste angezeigt "
 "wird."
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Automatische Emoticon-Erkennung"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "Automatische Link-Erkennung"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "Eingehende E-Mails daraufhin überprüfen, ob sie unerwünscht sind"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "Hervorhebungsfarbe für Zitate"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "Hervorhebungsfarbe für Zitate."
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "Vorgabehöhe des Editorfensters"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "Vorgabebreite des Editorfensters"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "Vorgabeverzeichnis für Anlagen im Nachrichteneditor"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Kürzen der Adressanzeige in den Empfängerfeldern (An/Kopie/Blindkopie)"
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12607,65 +13209,89 @@ msgstr ""
 "Die Anzeige der Adressen in den Empfängerfeldern (An/Kopie/Blindkopie) auf "
 "die im Schlüssel »address_count« angegebene Anzahl reduzieren."
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
+#, fuzzy
+msgid "Custom headers to use while checking for junk."
+msgstr ""
+"Gibt die Kopfzeile an, die für die Prüfung auf Unerwünschtheit genutzt wird."
+
+#: ../mail/evolution-mail.schemas.in.h:18
+#, fuzzy
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"Gibt die Kopfzeile an, die für die Prüfung auf Unerwünschtheit genutzt wird. "
+"Das Format ist »Kopfzeilenname=Wert« im GConf-Schlüssel."
+
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Default charset in which to compose messages"
 msgstr "Vorgabe-Zeichensatz beim Verfassen von Nachrichten"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages."
 msgstr "Vorgabe-Zeichensatz beim Verfassen von Nachrichten."
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to display messages"
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages."
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default forward style"
 msgstr "Vorgabe-Weiterleitungsstil"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default height of the Composer Window."
 msgstr "Die Vorgabehöhe des Editorfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the message window."
 msgstr "Die Vorgabehöhe des Nachrichtenfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the subscribe dialog."
 msgstr "Die Vorgabehöhe des Abonnementdialogs."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default reply style"
 msgstr "Vorgabe-Antwortstil"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default value for thread expand state"
 msgstr "Vorgabewert, ob Threads ausgeklappt angezeigt werden sollen"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default width of the Composer Window."
 msgstr "Die Vorgabebreite des Editorfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the message window."
 msgstr "Die Vorgabebreite des Nachrichtenfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the subscribe dialog."
 msgstr "Die Vorgabebreite des Abonnementdialogs."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:32
+#, fuzzy
+msgid ""
+"Determines whether to look up addresses for junk filtering in local "
+"addressbook only"
+msgstr ""
+"Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht "
+"wird"
+
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr ""
 "Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht "
 "wird"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12678,13 +13304,13 @@ msgstr ""
 "markiert sind. Diese Funktion kann langsam sein falls entfernte Adressbücher "
 "(wie LDAP) für die Auto-Vervollständigung aktiviert sind."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Legt fest, ob benutzerdefinierte Kopfzeilen für die Unerwünscht-Prüfung "
 "benutzt werden sollen"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12695,65 +13321,69 @@ msgstr ""
 "eine angegebene Kopfzeile auftritt, so wird hierdurch die Prüfung auf "
 "Unerwünschtheit beschleunigt."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
-"Legt fest, ob die gleichen Schriften für die »Von«- und die »Betreff«-Zeile "
-"in der »Nachrichten«-Spalte der vertikalen Ansicht verwendet werden."
+"Legt fest, ob die gleichen Schriften für die »Von«- und die »Betreff«-Zeile in "
+"der »Nachrichten«-Spalte der vertikalen Ansicht verwendet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Directory for loading/attaching files to composer."
 msgstr "Vorgabeverzeichnis für Anlagen im Nachrichteneditor."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for saving mail component files."
 msgstr "Ordner zum Speichern der E-Mailkomponenten-Dateien."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Indikatoren für Rechtschreibfehler bei der Eingabe zeichnen."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Empty Junk folders on exit"
 msgstr "Unerwünscht-Ordner beim Beenden leeren"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Trash folders on exit"
 msgstr "Müllordner beim Beenden leeren"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Alle Unerwünscht-Ordner beim Beenden von Evolution leeren."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Alle Müllordner beim Beenden von Evolution leeren."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Eingabezeiger aktivieren, so dass beim Lesen von E-Mails ein Cursor "
 "angezeigt wird."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable or disable magic space bar"
 msgstr "Magische Leertaste ein-/ausschalten"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable type ahead search feature"
 msgstr "Schnellsuche an- oder abschalten"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable search folders"
 msgstr "Suchordner aktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders on startup."
 msgstr "Aktiviert die Suchordner beim Starten von Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12765,7 +13395,7 @@ msgstr ""
 "Ordner finden, indem Sie nur dessen Name tippen, die Auswahl springt dann "
 "sofort zu diesem Ordner."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12773,29 +13403,29 @@ msgstr ""
 "Legt fest, ob die Leertaste zum Blättern in der Nachrichtenvorschau, der "
 "Nachrichtenliste und den Ordnern benutzt werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable to render message text part of limited size."
 msgstr ""
 "Verarbeiten von Nachrichten-Textteilen von begrenzter Größe aktivieren/"
 "deaktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable/disable caret mode"
 msgstr "Eingabezeiger aktivieren/deaktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Height of the message-list pane"
 msgstr "Höhe des Nachrichtenlistenfelds"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane."
 msgstr "Höhe des Nachrichtenlistenfelds."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Deaktiviert das Vorschaufenster und entfernt die Auswahl"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12803,7 +13433,7 @@ msgstr ""
 "Wenn ein Benutzer versucht, 10 oder mehr Nachrichten auf einmal zu öffnen, "
 "wird er gefragt, ob er es wirklich tun will."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12812,7 +13442,7 @@ msgstr ""
 "darunter anzeigen."
 
 # CHECK - etwas holprig
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12823,14 +13453,35 @@ msgstr ""
 "Bonobo-Komponentenbetrachter verknüpft ist, dieser Betrachter der GNOME-MIME-"
 "Datenbank entnommen und zum Anzeigen des Inhalts verwendet."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr ""
 "Die Anzeige während dem Markieren mehrerer Nachrichten aktivieren/"
 "deaktivieren"
 
 # FIXME
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -12838,7 +13489,7 @@ msgstr ""
 "Legt fest, ob jedes Mal vorm Setzen des Offline-Statuses gefragt werden "
 "soll, ob für den Offline-Modus synchronisiert werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -12848,31 +13499,31 @@ msgstr ""
 "Nachricht in einem Suchordner die Nachricht wirklich löscht und nicht nur "
 "aus den Suchergebnissen entfernt."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Last time empty junk was run"
 msgstr "Letzte Unerwünscht-Ordner-Leerung"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty trash was run"
 msgstr "Letzte Müllleerung"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Level beyond which the message should be logged."
 msgstr "Protokolltyp, ab welchem die Nachricht protokolliert werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "List of Labels and their associated colors"
 msgstr "Liste mit Beschriftungen und damit assoziierter Farben"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of accepted licenses"
 msgstr "Liste akzeptierter Lizenzen"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accounts"
 msgstr "Kontenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12881,12 +13532,16 @@ msgstr ""
 "enthält Zeichenketten, die Unterverzeichnisse relativ zu »/apps«/evolution/"
 "mail/accounts« angeben."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 "Liste der benutzerdefinierten Kopfzeilen und ihres Aktivierungszustands."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12896,21 +13551,21 @@ msgstr ""
 "HTML-Hextriplet anzugeben ist."
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Liste der MIME-Typen, die auf Bonobo-Komponentenbetrachter hin überprüft "
 "werden sollen"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste der Protokollnamen, deren Lizenzen akzeptiert wurden."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Load images for HTML messages over http"
 msgstr "Bilder von HTML-Nachrichten per HTTP laden"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net. 1 - Load images in messages from contacts. 2 - "
@@ -12920,117 +13575,117 @@ msgstr ""
 "Niemals Bilder aus dem Netz laden, 1 - Bilder laden falls Absender im "
 "Adressbuch, 2 - Immer Bilder aus dem Netz laden."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Log filter actions"
 msgstr "Filteraktionen protokollieren"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions to the specified log file."
 msgstr "Filteraktionen in der angegebenen Protokolldatei protokollieren."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Logfile to log filter actions"
 msgstr "Protokolldatei für Filteraktionen"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions."
 msgstr "Protokolldatei für Filteraktionen."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Mark as Seen after specified timeout"
 msgstr "Nach angegebenem Intervall als gelesen markieren"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout."
 msgstr "Nach angegebenem Intervall als gelesen markieren."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark citations in the message \"Preview\""
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Message Window default height"
 msgstr "Vorgabehöhe des Nachrichtenfensters"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default width"
 msgstr "Vorgabebreite des Nachrichtenfensters"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Stil der Nachrichtenanzeige. Zulässige Werte: »normal« (normal), »full "
 "headers« (alle Kopfzeilen), »source« (Quelltext)"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Minimale Anzahl der Tage zwischen dem Leeren des Unerwünscht-Ordners beim "
 "Beenden"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimale Anzahl der Tage zwischen dem Leeren des Mülls beim Beenden"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Minimale Anzahl der Tage zwischen dem Leeren des Unerwünscht-Ordners beim "
 "Beenden."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimale Anzahl der Tage zwischen dem Leeren des Mülls beim Beenden."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr ""
 "Anzahl der Adressen, die in den Empfängerfeldern (An/Kopie/Blindkopie"
 "( angezeigt werden"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Prompt on empty subject"
 msgstr "Bei leerem Betreff rückfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Rückfragen, falls ein Benutzer versucht, einen Ordner zu säubern."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Rückfragen, falls ein Benutzer versucht, eine Nachricht ohne Betreff zu "
 "verschicken."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr ""
 "Legt fest, ob der Benutzer gefragt werden soll, ob er sofort offline gehen "
 "möchte"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt when deleting messages in search folder"
 msgstr "Nachfrage beim Löschen von Nachrichten in Suchordner"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when user expunges"
 msgstr "Beim Säubern rückfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user only fills Bcc"
 msgstr "Rückfragen, falls der Benutzer nur das Blindkopie-Feld ausfüllt"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Vor gleichzeitigem Öffnen von 10 oder mehr Nachrichten einen Hinweis anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13038,74 +13693,74 @@ msgstr ""
 "Beim Verschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "rückfragen."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Beim Verschicken von Nachrichten ohne An- und Kopie-Feld rückfragen."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 "Rückfragen, falls der Benutzer versucht, nicht erwünschtes HTML zu "
 "verschicken"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt while marking multiple messages"
 msgstr "Anzeigen wenn mehrere Nachrichten markiert werden"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Emoticons im Text erkennen und durch Bilder ersetzen."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize links in text and replace them."
 msgstr "Links im Text erkennen und ersetzen."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Run junk test on incoming mail."
 msgstr "Unerwünscht-Test auf eingehende E-Mails anwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Save directory"
 msgstr "Ordner speichern"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Search for the sender photo in local addressbooks"
 msgstr "In den lokalen Adressbüchern nach dem Photo des Absenders suchen"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Send HTML mail by default"
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default."
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Sender email-address column in the message list"
 msgstr "Spalte mit der E-Mail-Adresse des Absenders in der Nachrichtenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Show Animations"
 msgstr "Animationen anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Show animated images as animations."
 msgstr "Animierte Bilder als Animationen anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Gelöschte Nachrichten (durchgestrichen) in der Nachrichtenliste anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show deleted messages in the message-list"
 msgstr "Gelöschte Nachrichten in der Nachrichtenliste anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show photo of the sender"
 msgstr "Photo des Absenders anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -13113,66 +13768,63 @@ msgstr ""
 "Zeigt die E-Mail-Adresse des Absenders in einer eigenen Spalte in der "
 "Nachrichtenliste an."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Photos des Absenders in der Nachrichtenvorschau anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "Specifies the header to check for junk."
-msgstr ""
-"Gibt die Kopfzeile an, die für die Prüfung auf Unerwünschtheit genutzt wird."
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Spell check inline"
+msgstr "Rechtschreibprüfung an Ort und Stelle"
 
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr ""
-"Gibt die Kopfzeile an, die für die Prüfung auf Unerwünschtheit genutzt wird. "
-"Das Format ist »Kopfzeilenname=Wert« im GConf-Schlüssel."
+#: ../mail/evolution-mail.schemas.in.h:127
+#, fuzzy
+msgid "Spell checking color"
+msgstr "Rechtschreibprüfung"
 
-#: ../mail/evolution-mail.schemas.in.h:117
-msgid "Spell check inline"
+#: ../mail/evolution-mail.schemas.in.h:128
+#, fuzzy
+msgid "Spell checking languages"
 msgstr "Rechtschreibprüfung an Ort und Stelle"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Subscribe dialog default height"
 msgstr "Vorgabehöhe des Abonnementdialogs"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Subscribe dialog default width"
 msgstr "Vorgabebreite des Abonnementdialogs"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Terminal font"
 msgstr "Terminal-Schrift"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Text message part limit"
 msgstr "Textnachrichtenteil-Begrenzung"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "The default plugin for Junk hook"
 msgstr "Vorgabe-Plugin für die Unerwünscht-Erkennung"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr ""
 "Die Zeit seit der letzten Unerwünscht-Ordner-Leerung in Tagen seit dem "
 "01.01.1970."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Die Zeit seit der letzten Müllleerung in Tagen seit dem 01.01.1970."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The terminal font for mail display."
 msgstr "Die zum Anzeigen von E-Mails verwendete Terminal-Schrift."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The variable width font for mail display."
 msgstr "Die zum Anzeigen von E-Mails verwendete Schrift variabler Breite."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -13180,7 +13832,7 @@ msgstr ""
 "Hier sind drei verschiedene Werte möglich: 0 für Fehler, 1 für Warnungen, 2 "
 "für Diagnosemeldungen."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -13188,7 +13840,7 @@ msgstr ""
 "Dies entscheidet die maximale Größe des Textteils, der von Evolution "
 "formatiert wird. Die Vorgabe sind 4MB/4096kb und ist in KB angegeben."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13198,7 +13850,7 @@ msgstr ""
 "aktiviert sind. Falls das als Vorgabe aufgelistete Plugin deaktiviert ist, "
 "so wird nicht auf eines der anderen Plugins zurückgegriffen."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "This key is read only once and reset to false after read. This unselects the "
 "mail in the list and removes the preview for that folder."
@@ -13209,7 +13861,7 @@ msgstr ""
 "Nachrichtenliste gesetzt."
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13221,11 +13873,18 @@ msgstr ""
 "Das XML-Strukturformat ist &lt;Kopfzeile aktiviert&gt; - setzen Sie "
 "aktiviert, falls die Kopfzeile in der E-Mail-Ansicht angezeigt werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local addressbook only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "This option would help in improving the speed of fetching."
 msgstr "Beschleunigt das Abrufen."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13233,7 +13892,7 @@ msgstr ""
 "Dies setzt die Anzahl der Adressen, die in der Standardansicht angezeigt "
 "werden, bevor »…« angezeigt wird."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13242,7 +13901,7 @@ msgstr ""
 "werden sollen. Evolution muss nach Ändern dieses Wertes hierfür neu "
 "gestartet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13252,110 +13911,128 @@ msgstr ""
 "werden sollen anstatt nach dem Datum der Nachricht. Evolution muss nach "
 "Ändern dieses Wertes hierfür neu gestartet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Thread the message list."
 msgstr "Die Nachrichtenliste nach Threads sortieren."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Thread the message-list"
 msgstr "Die Nachrichtenliste nach Threads sortieren"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message-list based on Subject"
 msgstr "Die Nachrichtenliste themenbasiert nach Threads sortieren"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Time interval, in seconds, how often upload store changes to server."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:152
+msgid ""
+"Time interval, in seconds, how often upload store changes to server. The "
+"actual value cannot be less than 30 seconds."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Intervall zum Markieren von Nachrichten als gelesen"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "Intervall zum Markieren von Nachrichten als gelesen."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "UID-Zeichenkette für das Vorgabekonto."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
 msgstr "SpamAssassin-Daemon und -Client verwenden"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "SpamAssassin-Daemon und -Client verwenden (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "Benutzerdefinierte Schriften verwenden"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "Benutzerdefinierte Schriften zum Anzeigen von E-Mails verwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "Ausschließlich lokale Spam-Tests verwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Ausschließlich lokale Spam-Tests verwenden (kein DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "Breite oder nebeneinander ausgerichtete Ansicht benutzen?"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "Schrift variabler Breite"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "Ansicht/Blindkopie-Menüeintrag ist aktiv"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "Ansicht/Blindkopie-Menüeintrag ist aktiv."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "Ansicht/Kopie-Menüeintrag ist aktiv"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "Ansicht/Kopie-Menüeintrag ist aktiv."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "Ansicht/Von-Menüeintrag ist aktiv"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "Ansicht/Von-Menüeintrag ist aktiv."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "Ansicht/Veröffentlichen-in-Menüeintrag ist aktiv"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "Ansicht/Veröffentlichen-in-Menüeintrag ist aktiv."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "Ansicht/Antwort-An-Menüeintrag ist aktiv"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "Ansicht/Antwort-An-Menüeintrag ist aktiv."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Legt fest, ob die Anforderung einer Lesebestätigung standardmäßig zu jeder "
 "Nachricht hinzugefügt wird."
 
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgstr ""
+
 # CHECK - etwas schluderig, kommt aber hoffentlich hin.
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13363,43 +14040,43 @@ msgstr ""
 "Auf Betreffbasis auf die Thread-Ordnung zurückgreifen, falls die Kopfzeilen "
 "einer Nachricht auf keine Referenznachricht verweisen."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Threads nach der letzten Nachricht im jeweiligen Thread sortieren"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "Breite der Nachrichtenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "Breite der Nachrichtenliste."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Elm-Daten werden importiert"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Evolution-Elm-Importeur"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "E-Mail von Elm importieren."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "Zielordner:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "Wählen Sie den Ordner, in den importiert werden soll"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importeur für Ordner im Berkeley-Mailbox-Format"
 
@@ -13407,7 +14084,7 @@ msgstr "Importeur für Ordner im Berkeley-Mailbox-Format"
 msgid "Importing mailbox"
 msgstr "E-Mail-Postfach wird importiert"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
 #, c-format
 msgid "Importing `%s'"
 msgstr "»%s« wird importiert"
@@ -13417,15 +14094,15 @@ msgstr "»%s« wird importiert"
 msgid "Scanning %s"
 msgstr "%s wird eingelesen"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "Pine-Daten werden importiert"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Evolution-Pine-Importeur"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "E-Mail von Pine importieren."
 
@@ -13453,142 +14130,153 @@ msgstr "Mailingliste %s"
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzufügen"
 
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#, fuzzy
+msgid "Templates"
+msgstr "Vorlage:"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d gewählt, "
 msgstr[1] "%d gewählt, "
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d gelöscht"
 msgstr[1] "%d gelöscht"
 
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d unerwünscht"
 msgstr[1] "%d unerwünscht"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d Entwurf"
 msgstr[1] "%d Entwürfe"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d verschickt"
 msgstr[1] "%d verschickt"
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d nicht verschickt"
 msgstr[1] "%d nicht verschickt"
 
-#: ../mail/mail-component.c:557
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ungelesen, "
 msgstr[1] "%d ungelesen, "
 
-#: ../mail/mail-component.c:558
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d insgesamt"
 msgstr[1] "%d insgesamt"
 
-#: ../mail/mail-component.c:899
+#: ../mail/mail-component.c:914
 msgid "New Mail Message"
 msgstr "Neue E-Mail-Nachricht"
 
-#: ../mail/mail-component.c:900
+#: ../mail/mail-component.c:915
 msgid "_Mail Message"
 msgstr "_E-Mail-Nachricht"
 
-#: ../mail/mail-component.c:901
+#: ../mail/mail-component.c:916
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: ../mail/mail-component.c:907
+#: ../mail/mail-component.c:922
 msgid "New Mail Folder"
 msgstr "Neuer E-Mail-Ordner"
 
-#: ../mail/mail-component.c:908
+#: ../mail/mail-component.c:923
 msgid "Mail _Folder"
 msgstr "E-Mail-_Ordner"
 
-#: ../mail/mail-component.c:909
+#: ../mail/mail-component.c:924
 msgid "Create a new mail folder"
 msgstr "Einen neuen E-Mail-Ordner anlegen"
 
-#: ../mail/mail-component.c:1056
+#: ../mail/mail-component.c:1071
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Auffrischen der E-Mail-Einstellungen oder -Ordner gescheitert."
 
-#: ../mail/mail-component.c:1529
+#: ../mail/mail-component.c:1584
 msgid "Error"
 msgstr "Fehler"
 
-#: ../mail/mail-component.c:1529
+#: ../mail/mail-component.c:1584
 msgid "Errors"
 msgstr "Fehler"
 
-#: ../mail/mail-component.c:1530
+#: ../mail/mail-component.c:1585
 msgid "Warnings and Errors"
 msgstr "Warnungen und Fehler"
 
-#: ../mail/mail-component.c:1531
+#: ../mail/mail-component.c:1586
 msgid "Debug"
 msgstr "Fehlerdiagnose"
 
-#: ../mail/mail-component.c:1531
+#: ../mail/mail-component.c:1586
 msgid "Error, Warnings and Debug messages"
 msgstr "Fehler, Warnungen und Diagnosemeldungen"
 
-#: ../mail/mail-component.c:1641
+#: ../mail/mail-component.c:1713
 msgid "Debug Logs"
 msgstr "Fehlerdiagnose-Protokoll"
 
-#. Translators: This is the first part of the sentence "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1646
+#: ../mail/mail-component.c:1727
 msgid "Show _errors in the status bar for"
 msgstr "_Fehlermeldungen in der Statusleiste für"
 
-#. Translators: This is the second part of the sentence "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1654
-#, fuzzy
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1743
 msgid "second(s)."
 msgstr "Sekunden anzeigen."
 
-#: ../mail/mail-component.c:1664
+#: ../mail/mail-component.c:1749
 msgid "Log Messages:"
 msgstr "Protokollmeldungen:"
 
-#: ../mail/mail-component.c:1716
+#: ../mail/mail-component.c:1790
 msgid "Log Level"
 msgstr "Protokolltyp"
 
-#: ../mail/mail-component.c:1723 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1799 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Uhrzeit"
 
-#: ../mail/mail-component.c:1730 ../mail/message-list.c:2405
+#: ../mail/mail-component.c:1809 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Nachrichten"
 
+#: ../mail/mail-component.c:1818 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Dieses Fenster schließen"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " _Prüfen, welche Arten unterstützt werden "
@@ -13602,7 +14290,7 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL wird von diesem Evolution-Build nicht unterstützt</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>Photo des Absenders</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13774,10 +14462,8 @@ msgid "Ch_eck for Supported Types "
 msgstr "_Prüfen, welche Arten unterstützt werden "
 
 #: ../mail/mail-config.glade.h:51
-#, fuzzy
 msgid "Check cu_stom headers for junk"
-msgstr ""
-"_Benutzerdefinierte Kopfzeilen für Prüfung auf Unerwünschtheit benutzen"
+msgstr "_Benutzerdefinierte Kopfzeilen auf Unerwünschtheit prüfen"
 
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
@@ -13842,13 +14528,13 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Ausgehende Nachrichten (per Vorgabe) digital _signieren"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+#, fuzzy
+msgid "Do not format messages when text si_ze exceeds"
 msgstr ""
 "Textinhalt in E-Mails nicht formatieren wenn folgende Text_größe "
 "überschritten wird:"
 
 #: ../mail/mail-config.glade.h:72
-#, fuzzy
 msgid "Do not mar_k messages as junk if sender is in my addressbook"
 msgstr ""
 "_Nachrichten nicht als Unerwünscht markieren, wenn der Absender im "
@@ -13989,19 +14675,25 @@ msgstr ""
 "eine Verbindung mit dem Server aufbauen"
 
 #: ../mail/mail-config.glade.h:109
+#, fuzzy
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+"Diese Einstellung wird ignoriert wenn ein Treffer für eine "
+"benutzerdefinierte Kopfzeile vorgefunden wird."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "_Organisation:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_Schlüsselkennung:"
 
-#: ../mail/mail-config.glade.h:111
-#, fuzzy
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "_Passwort:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -14009,7 +14701,7 @@ msgstr ""
 "Bitte geben Sie unten einen beschreibenden Namen für dieses Konto ein.\n"
 "Dieser Name wird nur zur Anzeige verwendet."
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14018,7 +14710,7 @@ msgstr ""
 "Mails verschicken wollen. Falls Sie sich nicht sicher sind, wenden Sie sich "
 "bitte an Ihren Systemadministrator oder Internet-Provider."
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14029,114 +14721,117 @@ msgstr ""
 "ausgefüllt werden, es sei denn, Sie wollen diese Informationen in von Ihnen "
 "verschickten E-Mails einschließen."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Bitte wählen Sie aus den folgenden Optionen"
 
-#: ../mail/mail-config.glade.h:118
-#, fuzzy
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
-msgstr "_Port:"
+msgstr "Port:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Beim Abschicken von Nachrichten mit ausschließlich _Blindkopie-Empfängern "
 "nachfragen"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Zitiert"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "An Passwort _erinnern"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "_Antwort an:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "An _Passwort erinnern"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "_Nach Photo des Absenders nur in den lokalen Adressbüchern suchen"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "A_uswählen …"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "Lese_bestätigungen verschicken:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "_Standard-Schrift:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Dicktengleiche HTML-Schrift wählen"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Dicktengleiche HTML-Druckschrift wählen"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "HTML-Proportionalschrift wählen"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "HTML-Proportionaldruckschrift wählen"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Verschicken von E-Mails"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Ordner für _verschickte Nachrichten:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "Server erfordert _Legitimation"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_Server-Art: "
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Signatur_zertifikat:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "_Signatur:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Signaturen"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Signaturtabelle"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Rechtschreibprüfung"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "T_yp:"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14144,7 +14839,7 @@ msgstr ""
 "Diese Sprachliste enthält ausschließlich die Sprachen, für die ein "
 "Wörterbuch installiert sind."
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14154,14 +14849,7 @@ msgstr ""
 "verwendet. Der von Ihnen angegebene Name\n"
 "wird lediglich zu Anzeigezwecken verwendet."
 
-#: ../mail/mail-config.glade.h:150
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"Diese Einstellung wird ignoriert wenn ein Treffer für eine "
-"benutzerdefinierte Kopfzeile vorgefunden wird."
-
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14169,26 +14857,24 @@ msgstr ""
 "Geben Sie einen Namen an, den Sie mit diesem Konto assoziieren,\n"
 "zum Beispiel »Geschäftlich« oder »Persönlich«."
 
-#: ../mail/mail-config.glade.h:153
-#, fuzzy
+#: ../mail/mail-config.glade.h:154
 msgid "Us_ername:"
 msgstr "_Benutzername:"
 
-#: ../mail/mail-config.glade.h:154
-#, fuzzy
+#: ../mail/mail-config.glade.h:155
 msgid "Use Authe_ntication"
-msgstr "Legitimation"
+msgstr "_Legitimation benutzen"
 
-#: ../mail/mail-config.glade.h:155 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:364
 msgid "User_name:"
 msgstr "_Benutzername:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "_Proportional:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14198,125 +14884,131 @@ msgstr ""
 "\n"
 "Klicken Sie auf »Vor«, um zu beginnen."
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "Signatur _hinzufügen"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "Bilder _immer aus dem Internet laden"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Automatic proxy configuration URL:"
 msgstr "Automatische Link-Erkennung"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "_Vorgabe-Unerwünscht-Plugin:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Besprechungsanfragen nicht signieren (zur Kompatibilität mit Outlook)"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "_Weiterleitungsstil:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "Signat_ur beim Antworten über der Original-Nachricht behalten"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "Bilder in Nachrichten von Kontakten _laden"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Lookup in local addressbook only"
+msgstr "Lokale Adressbuchordner auflisten"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "Dieses zum Vo_rgabekonto machen"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Manual proxy configuration:"
 msgstr "E-Mail-Konfiguration"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Nachrichten als gelesen markieren nach"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "Bilder _nie aus dem Internet laden"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Pfad:"
 
-#: ../mail/mail-config.glade.h:176
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#: ../mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "_Nachfrage beim Abschicken von HTML-Nachrichten an Kontakte, die dies nicht "
 "wünschen"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Nachfrage beim Abschicken von Nachrichten mit _leerem Betreff"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "_Antwortstil:"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "A_uswählen …"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "Bildanimationen an_zeigen"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Photo des Absenders in der Nachrichtenvorschau anzeigen"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "Empfängerkopfzeilen (An/Kopie/Blindkopie) _verkleinern zu "
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_Sichere Verbindung verwenden:"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:190
 #, fuzzy
 msgid "_Use system defaults"
 msgstr "_Vorgabe benutzen"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "Dieselben Schriften wie andere Anwendungen _verwenden"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "Adressen"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "Farbe"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "Beschreibung"
 
@@ -14356,69 +15048,68 @@ msgstr "_Groß-/Kleinschreibung berücksichtigen"
 msgid "Co_mpleted"
 msgstr "Abges_chlossen"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "S_uchen:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "In Nachricht suchen"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
 msgid "Flag to Follow Up"
 msgstr "Als Folgenachricht markieren"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Ordnerabonnements"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Lizenzvereinbarung"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Keiner gewählt"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "_Server:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Sicherheitsinformationen"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Bestimmte Ordner"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 "Dies ist eine Liste der von Ihnen als Folgenachricht markierten "
 "Nachrichten.\n"
-"Bitte wählen Sie eine Aktion für die Folgenachricht aus dem Menü "
-"»Markierung«."
+"Bitte wählen Sie eine Aktion für die Folgenachricht aus dem Menü »Markierung«."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "Lizenz _akzeptieren"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Fällig am:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Markierung:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "Ha_ken Sie dies ab, um die Lizenzvereinbarung zu akzeptieren"
 
-#: ../mail/mail-folder-cache.c:831
+#: ../mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
@@ -14465,11 +15156,11 @@ msgstr "Nachricht %d von %d wird verschickt"
 msgid "Failed to send %d of %d messages"
 msgstr "%d von %d Nachrichten konnten nicht verschickt werden"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "Abgebrochen."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "Abgeschlossen."
 
@@ -14497,67 +15188,72 @@ msgid "Opening folder %s"
 msgstr "Ordner %s wird geöffnet"
 
 #: ../mail/mail-ops.c:1270
+#, fuzzy, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "Kontaktinformationen für %s"
+
+#: ../mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Speicher %s wird geöffnet"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1410
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1499
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1562
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Konto »%s« wird gesäubert und gespeichert"
 
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1563
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto »%s« wird gespeichert"
 
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1617
 msgid "Refreshing folder"
 msgstr "Ordner wird aufgefrischt"
 
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
 msgid "Expunging folder"
 msgstr "Ordner wird gesäubert"
 
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1704
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Müll in »%s« wird geleert"
 
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1705
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1786
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s wird abgerufen"
 
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1893
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d Nachricht wird abgerufen"
 msgstr[1] "%d Nachrichten werden abgerufen"
 
-#: ../mail/mail-ops.c:1906
+#: ../mail/mail-ops.c:1978
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "%d Nachricht wird gespeichert"
 msgstr[1] "%d Nachrichten werden gespeichert"
 
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14566,11 +15262,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2128
 msgid "Saving attachment"
 msgstr "Anlage wird gespeichert"
 
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14579,51 +15275,51 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2169
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Verbindung mit %s wird erneut hergestellt"
 
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2411
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Konto '%s' wird für Offline-Betrieb vorbereitet"
 
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2497
 msgid "Checking Service"
 msgstr "Dienst wird überprüft"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:182
 msgid "Canceling..."
 msgstr "Absagevorgang …"
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:385
 msgid "Send & Receive Mail"
 msgstr "E-Mails verschicken und abrufen"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:396
 msgid "Cancel _All"
 msgstr "A_lles abbrechen"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:505
 msgid "Updating..."
 msgstr "Aktualisieren …"
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "Warten …"
 
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "Nach neuen E-Mails sehen"
@@ -14651,17 +15347,19 @@ msgstr "Geben Sie das Passwort ein"
 msgid "User canceled operation."
 msgstr "Benutzer hat Vorgang abgebrochen."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Signatur bearbeiten"
+#: ../mail/mail-signature-editor.c:201
+#, fuzzy
+msgid "_Save and Close"
+msgstr "Speichern und schließen"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "Geben Sie einen Namen für diese Signatur ein."
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "Signatur bearbeiten"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "Name:"
+#: ../mail/mail-signature-editor.c:370
+#, fuzzy
+msgid "_Signature Name:"
+msgstr "Signaturtabelle"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14671,8 +15369,7 @@ msgstr "Spool-Verzeichnis »%s« konnte nicht angelegt werden: %s"
 #: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr ""
-"Es wurde versucht, movemail auf eine nicht-mbox-Quelle »%s« auszuführen"
+msgstr "Es wurde versucht, movemail auf eine nicht-mbox-Quelle »%s« auszuführen"
 
 #: ../mail/mail-tools.c:256
 #, c-format
@@ -14703,31 +15400,30 @@ msgstr "Suchordner für »%s:%s« werden aktualisiert"
 msgid "Updating Search Folders for '%s'"
 msgstr "Suchordner für »%s« werden aktualisiert"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Suchordner bearbeiten"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Neuer Suchordner"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
 "Es existiert bereits ein Ordner namens »{0}«. Bitte verwenden Sie einen "
 "anderen Namen."
 
 #: ../mail/mail.error.xml.h:2
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 "Es existiert bereits ein Ordner namens »{1}«. Bitte verwenden Sie einen "
 "anderen Namen."
 
 #: ../mail/mail.error.xml.h:3
+#, fuzzy
 msgid ""
-"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"A non-empty folder at \"{1}\" already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
@@ -14738,17 +15434,19 @@ msgstr ""
 "oder abbrechen."
 
 #: ../mail/mail.error.xml.h:6
+#, fuzzy
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr ""
-"Eine Lesebestätigung wurde für »{1}« angefordert. Soll die Bestätigung an "
-"{0} geschickt werden?"
+"Eine Lesebestätigung wurde für »{1}« angefordert. Soll die Bestätigung an {0} "
+"geschickt werden?"
 
 #: ../mail/mail.error.xml.h:7
+#, fuzzy
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
 msgstr ""
 "Es existiert bereits eine Signatur namens »{0}«. Bitte verwenden Sie einen "
 "anderen Namen."
@@ -14791,12 +15489,13 @@ msgstr ""
 "Ordnern entfernen wollen?"
 
 #: ../mail/mail.error.xml.h:14
+#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
+"folder \"{0}\"?"
 msgstr ""
-"Sind Sie sicher, dass Sie alle gelöschten Nachrichten endgültig aus dem "
-"Ordner »{0}« entfernen wollen?"
+"Sind Sie sicher, dass Sie endgültig alle gelöschten Nachrichten aus allen "
+"Ordnern entfernen wollen?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14814,11 +15513,11 @@ msgstr ""
 "Sind Sie sicher, dass Sie eine Nachricht ohne Betreff verschicken wollen?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
+msgid "Because \"{0}\"."
 msgstr "Grund: »{0}«."
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
+msgid "Because \"{2}\"."
 msgstr "Grund: »{2}«."
 
 #: ../mail/mail.error.xml.h:21
@@ -14826,15 +15525,15 @@ msgid "Blank Signature"
 msgstr "Leere Signatur"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
+msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Suchordner »{0}« konnte nicht hinzugefügt werden."
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Ordner »{0}« konnte nicht nach »{1}« kopiert werden."
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
+msgid "Cannot create folder \"{0}\"."
 msgstr "Ordner »{0}« konnte nicht angelegt werden."
 
 #: ../mail/mail.error.xml.h:25
@@ -14842,54 +15541,53 @@ msgid "Cannot create temporary save directory."
 msgstr "Temporäres Speicherverzeichnis konnte nicht angelegt werden."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Das Speicherverzeichnis konnte nicht angelegt werden. Grund: »{1}«."
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
+msgid "Cannot delete folder \"{0}\"."
 msgstr "Ordner »{0}« konnte nicht gelöscht werden."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
+msgid "Cannot delete system folder \"{0}\"."
 msgstr "Systemordner »{0}« konnte nicht gelöscht werden."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr ""
 "Suchordner »{0}« konnte nicht bearbeitet werden, da er nicht vorhanden ist."
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Ordner »{0}« konnte nicht nach »{1}« verschoben werden."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
+msgid "Cannot open source \"{1}\""
 msgstr "Quelle »{1}« konnte nicht geöffnet werden"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
+msgid "Cannot open source \"{2}\"."
 msgstr "Quelle »{2}« konnte nicht geöffnet werden."
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
+msgid "Cannot open target \"{2}\"."
 msgstr "Ziel »{2}« konnte nicht geöffnet werden."
 
 #: ../mail/mail.error.xml.h:34
 msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"license."
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
 msgstr ""
 "Die Lizenzdatei »{0}« konnte wegen einem Installationsproblem nicht gelesen "
 "werden. Die Nutzung dieses Providers ist nicht möglich, solange Sie dessen "
 "Lizenz nicht akzeptiert haben."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "»{0}« konnte nicht in »{1}« umbenannt werden."
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Systemordner »{0}« konnte nicht umbenannt oder verschoben werden."
 
 #: ../mail/mail.error.xml.h:37
@@ -14897,18 +15595,23 @@ msgid "Cannot save changes to account."
 msgstr "Änderungen am Konto konnten nicht gespeichert werden."
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
+msgid "Cannot save to directory \"{0}\"."
 msgstr "Speichern in den Ordner »{0}« gescheitert."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
+msgid "Cannot save to file \"{0}\"."
 msgstr "Speichern in die Datei »{0}« gescheitert."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
+msgid "Cannot set signature script \"{0}\"."
 msgstr "Signaturskript »{0}« konnte nicht festgelegt werden."
 
 #: ../mail/mail.error.xml.h:41
+#, fuzzy
+msgid "Check Junk Failed"
+msgstr "Über_prüfung auf unerwünschte Nachrichten"
+
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14917,46 +15620,44 @@ msgstr ""
 "Erinnerung: Bei Passwörtern wird zwischen Groß- und Kleinschreibung "
 "unterschieden. Möglicherweise ist Ihre Dauerumschalttaste aktiv."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Signaturdatei konnte nicht gespeichert werden."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "»{0}« löschen?"
-
 #: ../mail/mail.error.xml.h:44
-msgid "Delete account?"
-msgstr "Konto löschen?"
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "Gelöscht: "
 
 #: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr "Nachrichten im Suchordner »{0}« löschen?"
+msgid "Delete account?"
+msgstr "Konto löschen?"
 
 #: ../mail/mail.error.xml.h:46
-msgid "Delete messages in Search Folder?"
+#, fuzzy
+msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Nachrichten im Suchordner löschen?"
 
 #: ../mail/mail.error.xml.h:47
+msgid "Delete messages in Search Folder?"
+msgstr "Nachrichten im Suchordner löschen?"
+
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "Änderungen verwerfen?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "Nicht l_öschen"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "Nicht löschen"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "Nicht deaktivieren"
 
-#: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "Soll diese Aktion auch in den Unterordnern ausgeführt werden?"
-
 #: ../mail/mail.error.xml.h:52
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
@@ -15067,39 +15768,31 @@ msgid "Mark all messages as read"
 msgstr "Alle Nachrichten als gelesen markieren"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "Sollen alle Nachrichten in Unterordnern als gelesen markiert werden?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "Ordner fehlt."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Keine Quellen gewählt."
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "Nur im der_zeitigen Ordner"
-
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 "Zu viele Nachrichten auf einmal zu öffnen, könnte eine längere Zeit in "
 "Anspruch nehmen."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr ""
 "Bitte überprüfen Sie ihre Kontoeinstellungen und versuchen Sie es erneut."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr ""
 "Aktivieren Sie bitte das Konto oder verwenden Sie ein anderes Konto zum "
 "Senden."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -15108,7 +15801,7 @@ msgstr ""
 "E-Mail-Adressen suchen, indem Sie den An-Knopf neben dem Eingabefeld "
 "anklicken."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -15119,36 +15812,47 @@ msgstr ""
 "{0}\n"
 "Dennoch abschicken?"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Geben Sie bitte einen eindeutigen Namen für diese Signatur ein."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Bitte warten."
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:85
+#, fuzzy
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Probleme beim Migrieren des alten E-Mail-Ordners »{0}«."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "Abfrage des Servers"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Abfrage des Servers nach einer Liste der unterstützten "
 "Legitimationsmechanismen."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "Lesebestätigung angefordert."
 
-#: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+#: ../mail/mail.error.xml.h:89
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Ordner »{0}« und alle seine Unterordner wirklich löschen?"
 
+#: ../mail/mail.error.xml.h:90
+#, fuzzy
+msgid "Report Junk Failed"
+msgstr "Datei importieren"
+
+#: ../mail/mail.error.xml.h:91
+msgid "Report Not Junk Failed"
+msgstr ""
+
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
 msgstr "Suchordner automatisch aktualisiert."
@@ -15200,7 +15904,7 @@ msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "Der bzw. die folgende(n) Suchordner:\n"
@@ -15214,7 +15918,7 @@ msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "Die folgende(n) Filterregel(n):\n"
@@ -15339,7 +16043,8 @@ msgstr ""
 "das Wählen aller lokalen, aller fernen Ordner oder beider."
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+#, fuzzy
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Das Anmelden am Server »{0}« als »{0}« ist gescheitert."
 
 #: ../mail/mail.error.xml.h:135
@@ -15362,77 +16067,92 @@ msgstr "_Säubern"
 msgid "_Open Messages"
 msgstr "Nachrichten ö_ffnen"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "im derzeitigen Ordner und in _Unterordnern"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Gelesen"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1054
+msgid "Forwarded"
+msgstr "Weitergeleitet"
+
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Niedriger"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Höher"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: ../mail/message-list.c:1613 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1620 ../plugins/itip-formatter/itip-view.c:206
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: ../mail/message-list.c:1629 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: ../mail/message-list.c:1641 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: ../mail/message-list.c:1649 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M"
 
-#: ../mail/message-list.c:1651 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:3837
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3885 ../mail/message-list.c:4321
 msgid "Generating message list"
 msgstr "Nachrichtenliste wird erzeugt"
 
+#: ../mail/message-list.c:4176
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4178
+#, fuzzy
+msgid "There are no messages in this folder."
+msgstr ""
+"\n"
+"\n"
+"In dieser Ansicht existieren keine anzuzeigenden Einträge."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Fällig am "
@@ -15462,39 +16182,39 @@ msgstr "Nachrichten verschicken"
 msgid "Size"
 msgstr "Größe"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Anrufen"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "Nicht weiterleiten"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "Folgenachricht"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Zu Ihrer Information"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "Keine Antwort erforderlich"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Antworten"
 
-#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Antwort an alle"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Überprüfen"
 
@@ -15531,14 +16251,6 @@ msgid "Provides core functionality for local address books."
 msgstr "Stellt Kernfunktionalität für lokale Adressbücher zur Verfügung."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "Anlagenerinnerung-Plugin aktivieren"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "Anlagenerinnerung aktivieren."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -15546,7 +16258,7 @@ msgstr ""
 "Liste der Begriffe, nach denen die Anlagenerinnerung im Text der Nachricht "
 "sucht"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
@@ -15554,14 +16266,11 @@ msgstr ""
 "Liste der Begriffe, nach denen die Anlagenerinnerung im Text der Nachricht "
 "sucht."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Schlüsselwörter"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "An vergessene Anlagen _erinnern"
-
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
 msgid "Attachment Reminder"
@@ -15588,8 +16297,8 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "Nachricht besitzt keine Anlagen"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
 msgstr "Nachricht _bearbeiten"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
@@ -15604,27 +16313,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Audio-Einbettungs-Plugin"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:107
 msgid "Select name of the Evolution backup file"
 msgstr "Name des Evolution-Sicherungsarchivs auswählen"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:136
 msgid "_Restart Evolution after backup"
 msgstr "Evolution nach Sicherung neu sta_rten"
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:159
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Evolution-Sicherungsarchiv zur Wiederherstellung wählen"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after restore"
 msgstr "Evolution nach Wiederherstellung neu sta_rten"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:256
 msgid "Restore from backup"
 msgstr "Aus Sicherungsdatei wiederherstellen"
 
-#: ../plugins/backup-restore/backup-restore.c:238
+#: ../plugins/backup-restore/backup-restore.c:258
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. \n"
@@ -15634,96 +16343,122 @@ msgstr ""
 "Alle E-Mails, Kalender, Aufgaben, Notizen und Adressbücher sowie alle\n"
 "persönlichen Einstellungen, Filter etc. können wiederhergestellt werden."
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restore Evolution from the backup file"
 msgstr "Evolution aus _Sicherungsdatei wiederherstellen"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:271
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Evolution-Archiv zur Wiederherstellung wählen:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:274
 msgid "Choose a file to restore"
 msgstr "Eine Datei zum Wiederherstellen wählen"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "Evolution-Sicherungsverzeichnis"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "Evolution-Wiederherstellungsverzeichnis"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "Evolution-Datensicherung"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "Evolution neu starten"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr "Mit grafischer Oberfläche"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "Evolution wird heruntergefahren"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "Sichern der Evolution-Konten und -Einstellungen"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Sichern der Evolution-Daten (E-Mails, Kontakte, Kalender, Aufgaben, Notizen)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "Sicherung komplett"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "Evolution wird neugestartet"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "Evolution-Daten sichern"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "Dateien aus dem Sicherungsarchiv extrahieren"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "Evolution-Einstellungen laden"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "Entfernen der temporären Sicherungsdateien"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Sichern nach %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Wiederherstellen von %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "Evolution-Datensicherung"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "Evolution-Wiederherstellung"
 
+#: ../plugins/backup-restore/backup.c:494
+#, fuzzy
+msgid "Backing up Evolution Data"
+msgstr "Evolution-Daten sichern"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:497
+#, fuzzy
+msgid "Restoring Evolution Data"
+msgstr "Evolution wird neugestartet"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:516
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
@@ -15760,14 +16495,24 @@ msgstr ""
 "soll."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#, fuzzy
+msgid "Insufficient Permissions"
+msgstr "Berechtigungen des Delegaten"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "Ungültiges Evolution-Archiv"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "Bitte wählen Sie ein gültiges Evolution-Archiv zur Wiederherstellung."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#, fuzzy
+msgid "The selected folder does not have enough permissions to create the file"
+msgstr "Sie haben keine ausreichenden Rechte um diese E-Mail zu löschen."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
 "This will delete all your current Evolution data and settings and restore "
 "them from your backup. Evolution restore can start only when Evolution is "
@@ -15801,8 +16546,8 @@ msgstr "Automatische Kontakte"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+#, fuzzy
+msgid "_Auto-create addressbook entries when replying to messages"
 msgstr ""
 "_Automatische Erstellung von Adressbucheinträgen bei Beantwortung von E-Mails"
 
@@ -15816,9 +16561,8 @@ msgstr "Instant-Messaging-Kontakte"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+#, fuzzy
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Kontaktinformationen und Bilder regelmäßig mit der Pidgin-Buddy-Liste "
 "abgleichen"
@@ -15846,7 +16590,28 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#, fuzzy, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "Während des Druckens ist ein Fehler aufgetreten"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr "Nachrichtentext nach _Unicode konvertieren"
 
@@ -15880,12 +16645,12 @@ msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:135
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:351
+#: ../plugins/google-account-setup/google-source.c:357
 msgid "Use _SSL"
 msgstr "_SSL verwenden"
 
@@ -15905,18 +16670,18 @@ msgstr "Lokale Kalender"
 msgid "Provides core functionality for local calendars."
 msgstr "Stellt Kernfunktionalität für lokale Kalender zur Verfügung."
 
-#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:375
+#: ../plugins/google-account-setup/google-source.c:381
 #, fuzzy
 msgid "Re_fresh:"
 msgstr "Auf_frischen"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "_Sichere Verbindung"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "_Benutzername:"
 
@@ -16020,14 +16785,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Möchten Sie Evolution zu Ihrer bevorzugten E-Mail-Anwendung machen?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:690
+#: ../shell/main.c:679
 msgid "Evolution"
 msgstr "Evolution"
 
 #: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "Als _Vorgabeordner markieren"
+msgid "Mark as _default address book"
+msgstr "Als _Vorgabeadressbuch markieren"
+
+#: ../plugins/default-source/default-source.c:102
+msgid "Mark as _default calendar"
+msgstr "Als _Vorgabekalender markieren"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default task list"
+msgstr "Als _Vorgabeaufgabenliste markieren"
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default memo list"
+msgstr "Als _Vorgabenotizliste markieren"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -16041,6 +16817,55 @@ msgstr ""
 "Stellt Funktionalität zum Markieren von Kalendern und Adressbüchern als "
 "Vorgabe zur Verfügung."
 
+#: ../plugins/email-custom-header/email-custom-header.c:562
+msgid "_Custom Header"
+msgstr "Benutzerdefinierte _Kopfzeile"
+
+#: ../plugins/email-custom-header/email-custom-header.c:883
+#, fuzzy
+msgid "Key"
+msgstr "Kenia"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr ""
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr "Benutzerdefinierte E-Mail-Kopfzeile"
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Adds custom header to outgoing messages."
+msgstr "Fügt ausgehenden Nachrichten eine benutzerdefinierte Kopfzeile hinzu."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "Benutzerdefinierte Kopfzeile"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Header"
+msgstr "Liste der benutzerdefinierten Kopfzeilen"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"Diese Liste legt die benutzerdefinierten Kopfzeilen fest, die ausgehenden "
+"Nachrichten hinzugefügt werden können. Das Format für eine Kopfzeile und "
+"ihren Wert ist: Name der Kopfzeile gefolgt von »=« und die Werte, die durch "
+"ein Semikolon (»;«) getrennt werden"
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Ordner eines anderen Benutzers öffnen"
@@ -16058,12 +16883,12 @@ msgid "_User:"
 msgstr "_Benutzer:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "Sicheres Passwort"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -16071,11 +16896,11 @@ msgstr ""
 "Diese Option stellt eine Verbindung mit dem Exchange-Server her, wobei eine "
 "sichere Passwort-Legitimation (NTLM) verwendet wird."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "Klartext-Passwort"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -16083,11 +16908,11 @@ msgstr ""
 "Diese Option stellt eine Verbindung mit dem Exchange-Server her, wobei ein "
 "einfaches Klartext-Passwort verwendet wird."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Nicht im Büro"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16095,77 +16920,82 @@ msgstr ""
 "Die unten angegebene Nachricht wird automatisch an jede Person verschickt,\n"
 "von der Sie eine E-Mail erhalten, während Sie nicht im Büro sind."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "Ich bin nicht im Büro"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "Ich bin im Büro"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Passwort für das Exchange-Konto ändern"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Passwort ändern"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Delegierungseinstellungen für das Exchange-Konto verwalten"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "Delegierungsassistent"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Verschiedenes"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "Die Größe aller Exchange-Ordner anzeigen"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Ordnergröße"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange-Einstellungen"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:674
 msgid "_OWA URL:"
 msgstr "_OWA-URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:700
 msgid "A_uthenticate"
 msgstr "_Legitimation"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:721
+#, fuzzy
+msgid "_Mailbox:"
+msgstr "_E-Mail"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:922
 msgid "_Authentication Type"
 msgstr "_Legitimationsart"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "Ch_eck for Supported Types"
 msgstr "_Prüfen, welche Arten unterstützt werden"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1048
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:1050
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -16184,7 +17014,7 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
+#: ../plugins/exchange-operations/exchange-change-password.c:113
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
@@ -16192,7 +17022,7 @@ msgstr ""
 "Das aktuelle Passwort stimmt nicht mit dem vorhandenen Passwort Ihres Kontos "
 "überein. Bitte geben Sie das korrekte Passwort ein."
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:120
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr ""
 "Die beiden Passworte stimmen nicht überein. Bitte geben Sie sie erneut ein."
@@ -16218,33 +17048,33 @@ msgstr "Ihr aktuelles Passwort ist abgelaufen. Bitte ändern Sie es jetzt."
 msgid "Your password will expire in the next %d days"
 msgstr "Ihr Passwort wird in den nächsten %d Tagen ablaufen"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Bearbeitung (lesen, erstellen, bearbeiten)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Erstellung (lesen, erstellen)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Einsicht (nur lesen)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Berechtigungen des Delegaten"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "Berechtigungen für %s"
@@ -16252,7 +17082,7 @@ msgstr "Berechtigungen für %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -16263,67 +17093,67 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 msgid "You have been given the following permissions on my folders:"
 msgstr "Sie haben nun folgende Zugriffserlaubnis auf meine Ordner:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
 msgstr "Es ist Ihnen zudem erlaubt, meine privaten Elemente zu sehen."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr ""
 "Es ist Ihnen allerdings nicht erlaubt, meine privaten Elemente zu sehen."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Sie wurden als Delegat für %s eingetragen"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To"
 msgstr "Delegieren an"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:580
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Den Delegaten %s entfernen?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "Zugriff auf Active Directory gescheitert"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Eigener Eintrag wurde in Active Directory nicht gefunden"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Delegat %s wurde in Active Directory nicht gefunden"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Delegat %s konnte nicht entfernt werden"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "Liste der Delegaten konnte nicht aktualisiert werden."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Delegat %s konnte nicht hinzugefügt werden"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:981
 msgid "Error reading delegates list."
 msgstr "Fehler beim Lesen der Delegatenliste."
 
@@ -16372,26 +17202,25 @@ msgstr "_Berechtigungen zusammenfassen"
 msgid "_Tasks:"
 msgstr "Auf_gaben:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:59
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Berechtigungen …"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
 msgid "Folder Name"
 msgstr "Ordnername"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
 msgid "Folder Size"
 msgstr "Ordnergröße"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
 msgid "User"
-msgstr "_Benutzer"
+msgstr "Benutzer"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Ordner eines anderen Benutzers abonnieren"
@@ -16400,20 +17229,20 @@ msgstr "Ordner eines anderen Benutzers abonnieren"
 msgid "Exchange Folder Tree"
 msgstr "Exchange-Ordnerbaum"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:235
-#: ../plugins/exchange-operations/exchange-folder.c:245
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:234
+#: ../plugins/exchange-operations/exchange-folder.c:244
 msgid "Unsubscribe Folder..."
 msgstr "Ordner abbestellen …"
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:519
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Den Ordner »%s« wirklich abbestellen?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:531
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Abbestellen von »%s«"
@@ -16478,17 +17307,18 @@ msgstr "Ihr Passwort wird in 7 Tagen ablaufen …"
 msgid "_Change Password"
 msgstr "Passwort ä_ndern"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(Erlaubnis verweigert.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
 msgid "Add User:"
 msgstr "Benutzer hinzufügen:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
-#: ../plugins/groupwise-features/proxy.c:946
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../plugins/groupwise-features/proxy.c:934
+#: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
 msgstr "Benutzer hinzufügen"
 
@@ -16610,11 +17440,11 @@ msgstr "_Benutzer"
 msgid "button-user"
 msgstr "button-user"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Benutzer auswählen"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "Adressbuch …"
 
@@ -16627,8 +17457,9 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Kalender eines anderen Benutzers abonnieren"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+#, fuzzy
 msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
+"A plugin that manages a collection of Exchange account specific operations "
 "and features."
 msgstr ""
 "Ein Plugin, das eine Reihe von Exchange-spezifischen Abläufen und Funktionen "
@@ -16724,10 +17555,14 @@ msgid "Could not update out-of-office state"
 msgstr "Abwesenheitsstatus konnte nicht aktualisiert werden"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "Exchange-Konto ist offline."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16755,32 +17590,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Aktualisierung der Delegaten gescheitert:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Ordner existiert bereits"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Ordner existiert nicht"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Ordner offline"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "Globaler Katalog-Server ist nicht erreichbar"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -16788,81 +17623,81 @@ msgstr ""
 "Falls OWA unter einem anderen Pfad läuft, muss dies im Konten-"
 "Konfigurationsdialog angegeben werden."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "Das Postfach für {0} befindet sich nicht auf diesem Server."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr ""
 "Stellen Sie sicher, dass die Adresse korrekt ist und versuchen Sie es erneut."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 "Stellen Sie sicher, dass der Name des Servers korrekt geschrieben ist und "
 "versuchen Sie es erneut."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 "Stellen Sie sicher, dass Benutzername und Passwort korrekt sind und "
 "versuchen Sie es erneut."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "Für dieses Konto ist kein globaler Katalog-Server konfiguriert."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "Kein Postfach für den Benutzer {0} auf {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Benutzer {0} nicht vorhanden"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "Das Passwort wurde erfolgreich geändert."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 "Bitte geben Sie die Benutzerkennung des Delegaten ein oder wählen Sie die "
 "Option Als Delegat senden ab."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr ""
 "Soll dieses Objekt von allen anderen Postfächern der Empfänger ge_löscht "
 "werden?"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr ""
 "Bitte starten Sie Evolution neu, damit die Änderungen angewendet werden"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Bitte wählen Sie einen Benutzer."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "Der Server hat das Passwort abgelehnt, da es zu einfach ist."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Das Exchange-Konto wird deaktiviert, sobald Sie Evolution beenden"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Das Exchange-Konto wird entfernt, sobald Sie Evolution beenden"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Der Exchange-Server ist mit dem Exchange-Connector nicht kompatibel."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -16870,7 +17705,7 @@ msgstr ""
 "Auf dem Server läuft Exchange 5.5. Exchange-Connector \n"
 "unterstützt nur Microsoft Exchange 2000 und 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -16884,42 +17719,42 @@ msgstr ""
 "\n"
 "Oder Sie haben nur ein falsches Passwort eingegeben."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "Versuchen Sie es mit einem anderen Passwort noch einmal."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr ""
 "Der Benutzer konnte nicht zur Zugriffskontrollliste hinzugefügt werden:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Bearbeitung der Delegaten nicht möglich."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Unbekannter Fehler beim Suchen von {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Unbekannte Art"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Nicht unterstützte Aktion"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "Sie nähern sich Ihrem Speicherplatzlimit zum Ablegen von Nachrichten auf "
 "diesem Server."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
@@ -16927,21 +17762,21 @@ msgstr ""
 "Es ist Ihnen nur gestattet, Nachrichten im Namen eines Delegaten "
 "gleichzeitig zu verschicken."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "Sie können sich nicht selbst als Ihren eigenen Delegaten angeben."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr ""
 "Sie haben Ihr Speicherplatzlimit zum Ablegen von Nachrichten auf diesem "
 "Server überschritten."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "Sie dürfen nur ein einziges Exchange-Konto konfigurieren."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -16949,7 +17784,7 @@ msgstr ""
 "Ihre momentane Speicherplatznutzung liegt bei {0} kB. Versuchen Sie durch "
 "das Löschen einiger Nachrichten etwas Platz zu schaffen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -16957,7 +17792,7 @@ msgstr ""
 "Ihre momentane Speicherplatznutzung liegt bei {0} kB. Sie sind jetzt nicht "
 "mehr in der Lage, Nachrichten zu senden oder zu empfangen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -16966,19 +17801,19 @@ msgstr ""
 "Speicherplatz durch das Löschen einiger Nachrichten freigemacht wurde, "
 "werden Sie wieder Nachrichten verschicken können."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "Ihr Passwort ist abgelaufen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} kann nicht zu einer Zugriffskontrollliste hinzugefügt werden."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} ist bereits ein Delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} befindet sich bereits in der Liste"
 
@@ -16990,6 +17825,15 @@ msgstr "Aufgaben eines anderen Benutzers abonnieren"
 msgid "Check folder permissions"
 msgstr "Ordnerberechtigungen überprüfen"
 
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+#, fuzzy
+msgid "Default External Editor"
+msgstr "Externer Editor"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr ""
+
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
 "A plugin for using an external editor as the composer. You can send only "
@@ -17003,6 +17847,27 @@ msgstr ""
 msgid "External Editor"
 msgstr "Externer Editor"
 
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#, fuzzy
+msgid "Cannot create Temporary File"
+msgstr "Temporäres Speicherverzeichnis konnte nicht angelegt werden."
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
 msgid "Compose in External Editor"
 msgstr "Im externen Editor verfassen"
@@ -17011,6 +17876,16 @@ msgstr "Im externen Editor verfassen"
 msgid "Compose messages using an external editor"
 msgstr "E-Mails mit einem externen Editor verfassen"
 
+#: ../plugins/external-editor/external-editor.c:91
+msgid "Command to be executed to launch the editor: "
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:92
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+
 #: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Wählen Sie eine 48*48-Pixel-PNG-Datei kleiner als 700 Bytes"
@@ -17019,7 +17894,7 @@ msgstr "Wählen Sie eine 48*48-Pixel-PNG-Datei kleiner als 700 Bytes"
 msgid "PNG files"
 msgstr "PNG-Dateien"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:125
 msgid "_Face"
 msgstr "_Gesicht"
 
@@ -17056,20 +17931,39 @@ msgstr "Ordner abbestellen"
 msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:73
+#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+#, fuzzy
+msgid "<b>Server</b>"
+msgstr "<b>Mitglieder</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+#, fuzzy
+msgid "Username:"
+msgstr "_Benutzername:"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:230
+#, fuzzy
+msgid "Update every"
+msgstr "Abfrage wird aktualisiert"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
+#, fuzzy
+msgid "A plugin to setup google calendar and contacts."
 msgstr "Ein Plugin zum Einrichten des Google-Kalenders."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Google-Quellen"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
 msgstr "Checkliste"
 
@@ -17149,6 +18043,17 @@ msgid "_Junk List"
 msgstr "_Unerwünscht-Liste"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+#, fuzzy
+msgid "Message Retract"
+msgstr "Nachrichtenstatus"
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr ""
 "Aktivieren der Seitenleisten-Suchfunktion, damit Sie interaktiv suchen "
@@ -17156,7 +18061,7 @@ msgstr ""
 "Ordner finden, indem Sie nur dessen Name tippen, die Auswahl springt dann "
 "sofort zu diesem Ordner."
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "E-Mail zurückziehen"
 
@@ -17164,12 +18069,6 @@ msgstr "E-Mail zurückziehen"
 msgid "Add Send Options to groupwise messages"
 msgstr "Versandoptionen zu GroupWise-Nachrichten hinzufügen"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Versandoptionen"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Ein Plugin für die Funktionen von GroupWise-Konten."
@@ -17194,10 +18093,9 @@ msgstr "Die gewählte Nachricht in eine neue Aufgabe umwandeln"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
-#, fuzzy
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
 msgid "Invalid user"
-msgstr "Ungültige Signatur"
+msgstr "Ungültiger Benutzer"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
 #, fuzzy
@@ -17205,7 +18103,7 @@ msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "Speichern in die Datei »{0}« gescheitert."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
 #, fuzzy
 msgid "Specify User"
 msgstr "Benutzer auswählen"
@@ -17227,9 +18125,8 @@ msgstr ""
 "anderen Namen."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-#, fuzzy
 msgid "Account Already Exists"
-msgstr "Signatur existiert bereits"
+msgstr "Konto existiert bereits"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
 msgid ""
@@ -17237,32 +18134,27 @@ msgid ""
 "try again."
 msgstr ""
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 #, fuzzy
-msgid "All instances"
-msgstr "Alle Instanzen"
+msgid "This is a recurring meeting"
+msgstr "Dies zu einem wiederkehrenden Ereignis machen"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
 #, fuzzy
-msgid "This instance"
-msgstr "Nur diese Instanz"
+msgid "Would you like to accept it?"
+msgstr "Wollen Sie die vorgenommenen Änderungen speichern?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 #, fuzzy
-msgid "This is a recurring meeting"
-msgstr "Dies zu einem wiederkehrenden Ereignis machen"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-#, fuzzy
-msgid "What would you like to {0}?"
+msgid "Would you like to decline it?"
 msgstr "Wollen Sie die vorgenommenen Änderungen speichern?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
 #, fuzzy
 msgid "You cannot share folder with specified user &quot;{0}&quot;"
 msgstr "Automatisches Speichern in Datei »{0}« gescheitert."
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "You have to specify a user name whom you want to add to the list"
 msgstr ""
 
@@ -17364,9 +18256,9 @@ msgstr "<b>Kontoname</b>"
 msgid "Proxy Login"
 msgstr "Vertretungsanmeldung"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -17375,20 +18267,20 @@ msgstr "%sPasswort für %s (Benutzer %s) eingeben"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:521
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "_Vertretungsanmeldung …"
 
-#: ../plugins/groupwise-features/proxy.c:703
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Der Vertretungsreiter ist nur verfügbar, wenn das Konto online ist."
 
-#: ../plugins/groupwise-features/proxy.c:708
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Der Vertretungsreiter ist nur verfügbar, wenn das Konto aktiviert ist."
 
 #: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Benutzer"
 
@@ -17404,16 +18296,16 @@ msgstr "Neue Ordner_freigabe …"
 msgid "Sharing"
 msgstr "Freigeben"
 
-#: ../plugins/groupwise-features/share-folder.c:544
+#: ../plugins/groupwise-features/share-folder.c:533
 #, fuzzy
 msgid "Custom Notification"
 msgstr "Ausrichtung"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "Hinzufügen   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "Ändern"
 
@@ -17478,11 +18370,11 @@ msgstr "Ein Plugin zum Einrichten von Hula-Kalenderquellen."
 msgid "Hula Account Setup"
 msgstr "Hula-Kontoeinrichtung"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "Benutzerdefinierte Kopfzeilen"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP-Kopfzeilen"
 
@@ -17536,28 +18428,28 @@ msgstr "Ein Plugin für die Funktionen von IMAP-Konten."
 msgid "IMAP Features"
 msgstr "IMAP-Funktionen"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "In Kalender i_mportieren …"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "In Aufgaben i_mportieren"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "ICS importieren"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "Aufgabenliste auswählen"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "Kalender auswählen"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:263
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../shell/e-shell-importer.c:700
 msgid "_Import"
 msgstr "_Importieren"
 
@@ -17595,8 +18487,8 @@ msgstr ""
 "Evolution konnte keinen iPod zum Synchronisieren finden. Entweder der iPod "
 "ist nicht angeschlossen oder er ist ausgeschaltet."
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar-Format (.ics)"
 
@@ -17736,13 +18628,13 @@ msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 "Verschicken der Notizinformationen nicht möglich, die Notiz existiert nicht"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1372
-#: ../plugins/itip-formatter/itip-formatter.c:1387
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid "The calendar attached is not valid"
 msgstr "Der beigelegte Kalender ist ungültig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1373
-#: ../plugins/itip-formatter/itip-formatter.c:1388
+#: ../plugins/itip-formatter/itip-formatter.c:1367
+#: ../plugins/itip-formatter/itip-formatter.c:1378
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17750,15 +18642,15 @@ msgstr ""
 "Die Nachricht gibt an, einen Kalender zu enthalten. Dieser Kalender ist "
 "jedoch kein gültiger iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1423
-#: ../plugins/itip-formatter/itip-formatter.c:1441
-#: ../plugins/itip-formatter/itip-formatter.c:1523
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "The item in the calendar is not valid"
 msgstr "Das Element im Kalender ist ungültig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1424
-#: ../plugins/itip-formatter/itip-formatter.c:1442
-#: ../plugins/itip-formatter/itip-formatter.c:1524
+#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1437
+#: ../plugins/itip-formatter/itip-formatter.c:1519
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17766,11 +18658,11 @@ msgstr ""
 "Die Nachricht enthält einen Kalender. Dieser beinhaltet allerdings keine "
 "Ereignisse, Aufgaben oder Verfügbarkeitsinformationen."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1453
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "The calendar attached contains multiple items"
 msgstr "Der beigelegte Kalender enthält mehrere Elemente."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1454
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17778,229 +18670,229 @@ msgstr ""
 "Um alle diese Elemente weiterzuverarbeiten, sollte die Datei gespeichert und "
 "der Kalender importiert werden."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "Diese Besprechung wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "Diese Aufgabe wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2157
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "Diese Notiz wird wiederholt"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2372
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "_Löschen der Nachricht nach Abarbeitung"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2382
-#: ../plugins/itip-formatter/itip-formatter.c:2414
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "Konfliktsuche"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2397
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Kalender zur Suche nach Besprechungskonflikten auswählen"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "Heute"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:195
 msgid "Today %H:%M"
 msgstr "Heute %k:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:199
 msgid "Today %H:%M:%S"
 msgstr "Heute %k:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:208
 msgid "Today %l:%M:%S %p"
 msgstr "Heute %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:218
 msgid "Tomorrow"
 msgstr "Morgen"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow %H:%M"
 msgstr "Morgen %k:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:227
 msgid "Tomorrow %H:%M:%S"
 msgstr "Morgen %k:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %l:%M %p"
 msgstr "Morgen %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:236
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Morgen %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../plugins/itip-formatter/itip-view.c:255
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:260
 msgid "%A %H:%M"
 msgstr "%A %k:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:266
+#: ../plugins/itip-formatter/itip-view.c:264
 msgid "%A %H:%M:%S"
 msgstr "%A %k:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:275
+#: ../plugins/itip-formatter/itip-view.c:273
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e"
 msgstr "%A, %e. %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:288
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e. %B %k:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:292
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e. %B %k:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e. %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e. %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:307
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e. %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e. %B %Y %k:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:316
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e. %B %Y %k:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e. %B %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:325
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e. %B %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:526
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Bitte antworten Sie im Namen von <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Erhalten im Namen von <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:357
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr ""
 "<b>%s</b> hat durch %s folgende Besprechungsinformationen veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:359
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> hat folgende Besprechungsinformationen veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> hat folgende Besprechung an Sie delegiert:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> wünscht durch %s Ihre Teilnahme an folgender Besprechung:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> wünscht Ihre Teilnahme an folgender Besprechung:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:375
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr ""
 "<b>%s</b> wünscht durch %s zu einer existierenden Besprechung hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:377
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> wünscht zu einer existierenden Besprechung hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18009,7 +18901,7 @@ msgstr ""
 "<b>%s</b> durch %s wünscht, aktuelle Informationen zu folgender Besprechung "
 "zu erhalten:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
@@ -18017,82 +18909,82 @@ msgstr ""
 "<b>%s</b> wünscht, aktuelle Informationen zu folgender Besprechung zu "
 "erhalten:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:387
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> durch %s hat folgende Besprechungsrückmeldung geschickt:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:389
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> hat folgende Besprechungsrückmeldung geschickt:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:393
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> hat durch %s folgende Besprechung abgesagt:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:395
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> hat folgende Besprechung abgesagt:"
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:399
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> durch %s hat folgende Besprechungsänderungen vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:401
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> hat folgende Besprechungsänderungen vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:405
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> hat durch %s folgende Besprechungsänderungen abgelehnt:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:407
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> hat folgende Besprechungsänderungen abgelehnt:"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:445
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> hat durch %s folgende Aufgabe veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> hat folgende Aufgabe veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> wünscht die Zuweisung folgender Aufgabe an %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:455
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> hat Ihnen durch %s eine Aufgabe zugewiesen:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> hat Ihnen eine Aufgabe zugewiesen:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:463
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> wünscht durch %s zu einer bestehenden Aufgabe hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:465
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> wünscht zu einer bestehenden Aufgabe hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18101,7 +18993,7 @@ msgstr ""
 "<b>%s</b> durch %s wünscht aktuelle Informationen zu folgender zugewiesener "
 "Aufgabe zu erhalten:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:471
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18110,7 +19002,7 @@ msgstr ""
 "<b>%s</b> wünscht aktuelle Informationen zu folgender zugewiesener Aufgabe "
 "zu erhalten:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:475
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
@@ -18118,23 +19010,23 @@ msgstr ""
 "<b>%s</b> durch %s hat folgende Rückmeldung zu einer zugewiesenen Aufgabe "
 "geschickt:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:477
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr ""
 "<b>%s</b> hat folgende Rückmeldung zu einer zugewiesenen Aufgabe geschickt:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:481
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> hat durch %s folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:483
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> hat folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:487
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
@@ -18142,103 +19034,103 @@ msgstr ""
 "<b>%s</b> durch %s hat folgende Änderungen an der Aufgabenzuweisung "
 "vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:489
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 "<b>%s</b> hat folgende Änderungen an der Aufgabenzuweisung vorgeschlagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:493
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> hat durch %s folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:495
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> hat die folgende zugewiesene Aufgabe zurückgezogen:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:533
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> hat durch %s folgende Notiz veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> hat folgende Notiz veröffentlicht:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:540
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> wünscht durch %s zu einer existierenden Notiz hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> wünscht zu einer existierenden Notiz hinzuzufügen:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> hat durch %s folgende gemeinsame Notiz gelöscht:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> hat folgende gemeinsame Notiz gelöscht:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:819
 msgid "_Open Calendar"
 msgstr "Kalender ö_ffnen"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:852
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Decline"
 msgstr "Ab_lehnen"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:826
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Accept"
 msgstr "An_nehmen"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Decline all"
 msgstr "Alles a_blehnen"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Tentative all"
 msgstr "Alles vorläu_fig"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:836
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Tentative"
 msgstr "_Vorläufig"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Accept all"
 msgstr "Alles anneh_men"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Send Information"
 msgstr "Informationen über_mitteln"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Update Attendee Status"
 msgstr "Teilnehmerstatus a_ktualisieren"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:849
 msgid "_Update"
 msgstr "A_ktualisieren"
 
@@ -18397,12 +19289,22 @@ msgstr ""
 "Legt fest, ob nur über Nachrichten im Eingangsordner benachrichtigt werden "
 "soll."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "Eine _D-Bus-Nachricht erzeugen"
 
+#: ../plugins/mail-notification/mail-notification.c:361
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "Benachrichtigung bei neuen E-Mails"
+
+#: ../plugins/mail-notification/mail-notification.c:382
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "Benachrichtigung bei neuen E-Mails"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:440
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18413,55 +19315,55 @@ msgid_plural ""
 msgstr[0] "Sie haben %d neue Nachricht in %s."
 msgstr[1] "Sie haben %d neue Nachrichten in %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:445
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Sie haben %d neue Nachricht."
 msgstr[1] "Sie haben %d neue Nachrichten."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:462
 msgid "New email"
 msgstr "Neue E-Mail"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:519
 msgid "Show icon in _notification area"
 msgstr "Symbol im _Benachrichtigungsfeld anzeigen"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:522
 msgid "B_link icon in notification area"
 msgstr "_Blinkendes Symbol im Benachrichtigungsfeld"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:524
 msgid "Popup _message together with the icon"
 msgstr "Popup-_Nachricht zusammen mit Symbol anzeigen"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:705
 msgid "_Play sound when new messages arrive"
 msgstr "Beim Eintreffen neuer E-Mails _Klang abspielen"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:711
 msgid "_Beep"
 msgstr "_Signalton ausgeben"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:712
 msgid "Play _sound file"
 msgstr "Klang_datei abspielen"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:723
 msgid "Specify _filename:"
 msgstr "_Dateiname angeben:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:724
 msgid "Select sound file"
 msgstr "Klangdatei auswählen"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:725
 msgid "Pl_ay"
 msgstr "A_bspielen"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:782
 msgid "Notify new messages for _Inbox only"
 msgstr "Nur über neue Nachrichten im _Eingangsordner benachrichtigen."
 
@@ -18609,9 +19511,10 @@ msgid "Send e-mail message to mailing list?"
 msgstr "Die Nachricht an die Mailingliste schicken?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#, fuzzy
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -18696,6 +19599,28 @@ msgstr "Liste _abonnieren"
 msgid "_Unsubscribe from List"
 msgstr "Liste _abbestellen"
 
+#: ../plugins/mark-all-read/mark-all-read.c:37
+msgid "Mark all messages in this folder and subfolders as read?"
+msgstr "Sollen alle Nachrichten in Unterordnern als gelesen markiert werden?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+msgid "Do you want the operation to be performed also in the subfolders?"
+msgstr "Soll diese Aktion auch in den Unterordnern ausgeführt werden?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:85
+msgid "Mark All Messages as Read"
+msgstr "Alle Nachrichten als gelesen markieren"
+
+#: ../plugins/mark-all-read/mark-all-read.c:162
+#, fuzzy
+msgid "Current Folder and _Subfolders"
+msgstr "im derzeitigen Ordner und in _Unterordnern"
+
+#: ../plugins/mark-all-read/mark-all-read.c:174
+#, fuzzy
+msgid "Current _Folder Only"
+msgstr "Derzeitiger Ordner"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Alles als gelesen markieren"
@@ -18738,7 +19663,7 @@ msgstr "Ein Plugin zur Verwaltung der Plugin-Aktivierungszustände."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "Plugin-Verwaltung"
 
@@ -18750,33 +19675,24 @@ msgstr "Plugins aktivieren und deaktivieren"
 msgid "_Plugins"
 msgstr "_Plugins"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:42
 msgid "Author(s)"
 msgstr "Autor(en)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Beschreibung"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "Konfiguration"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Hinweis: Einige Änderungen werden erst nach einem Neustart wirksam."
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
 msgstr "Überblick"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "Konfiguration"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "Für dieses Plugin bestehen keine Konfigurationsoptionen."
-
-#: ../plugins/plugin-manager/plugin-manager.c:338
-#: ../plugins/plugin-manager/plugin-manager.c:400
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -18802,43 +19718,22 @@ msgstr "Einfacher Textmodus"
 msgid "Prefer plain-text"
 msgstr "Einfachen Text bevorzugen"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
 msgstr "HTML anzeigen, wenn vorhanden"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
 msgstr "Einfachen Text bevorzugen"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:176
 msgid "Only ever show PLAIN"
 msgstr "Immer als einfachen Text anzeigen"
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:219
 msgid "HTML _Mode"
 msgstr "HTML-_Modus"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr ""
-"Bereitstellung einer Möglichkeit zum Drucken von E-Mails aus dem Editor "
-"heraus."
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "Nachricht drucken"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "Druck_vorschau"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "Nachricht drucken"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "Evolution-Profiler"
@@ -18863,13 +19758,7 @@ msgstr "Orte"
 msgid "_Publish Calendar Information"
 msgstr "Kalenderinformationen verö_ffentlichen"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "Geben Sie das Passwort für »%s« ein"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "Sind Sie sicher, dass Sie diese URL entfernen wollen?"
 
@@ -18957,15 +19846,79 @@ msgstr ""
 "iCal\n"
 "Verfügbarkeit"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+#, fuzzy
+msgid "Hello Python"
+msgstr "Telefon, privat"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+#, fuzzy
+msgid "Python Loader"
+msgstr "Mono-Loader"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (eingebaut)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, fuzzy, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "SpamAssassin-Unerwünscht-Plugin"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, fuzzy, c-format
+msgid "Failed to create pipe: %s"
+msgstr "Lokaler E-Mail-Speicher unter »%s« konnte nicht angelegt werden: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, fuzzy, c-format
+msgid "Error after fork: %s"
+msgstr ""
+"Fehler bei »%s«:\n"
+" %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, fuzzy, c-format
+msgid "SpamAssassin is not available."
+msgstr "Die Versandoptionen sind nicht verfügbar."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Dies erhöht die Zuverlässigkeit des Filters, verlangsamt ihn jedoch"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "Zusätzliche _Ferntests durchführen"
 
@@ -18993,7 +19946,7 @@ msgstr ""
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:330
+#: ../plugins/save-attachments/save-attachments.c:314
 msgid "Save attachments"
 msgstr "Anlagen speichern"
 
@@ -19005,16 +19958,15 @@ msgstr "Anlagen speichern …"
 msgid "Save all attachments"
 msgstr "Alle Anlagen speichern"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "Basisnamen zum Speichern festlegen"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "MIME-Typ"
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "Speichern"
 
@@ -19022,79 +19974,79 @@ msgstr "Speichern"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:167
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%d.%m.%Y %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "Beschreibungsliste"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "Kategorienliste"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "Kommentarliste"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "Angelegt"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "Kontaktliste"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "Anfang"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "Ende"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "Prozent abgeschlossen"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "Teilnehmerliste"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "Geändert"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "Erweiterte Einstellungen für das CSV-Format"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "Einen Kopf voranstellen"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "Variablentrennzeichen:"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "Eintragstrennzeichen:"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "Variablen einschließen in:"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "Kommaseparierte Variablen (.csv)"
 
@@ -19117,15 +20069,15 @@ msgstr "Auf Datenträger _speichern"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:154
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%d.%m.%YT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "RDF-Format (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "Zieldatei wählen"
 
@@ -19150,7 +20102,8 @@ msgid "Show _only this Task List"
 msgstr "Nur diese Auf_gabenliste anzeigen"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
+#, fuzzy
+msgid "A plugin that manages the Startup wizard."
 msgstr "Ein Plugin zur Bereitstellung eines Einrichtungsassistenten."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
@@ -19183,24 +20136,24 @@ msgid "Importing files"
 msgstr "Dateien werden importiert"
 
 #: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:144
 msgid "Please select the information that you would like to import:"
 msgstr "Bitte wählen Sie die Informationen, die Sie importieren wollen:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../shell/e-shell-importer.c:397
 #, c-format
 msgid "From %s:"
 msgstr "Von %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../shell/e-shell-importer.c:508
 #, c-format
 msgid "Importing data."
 msgstr "Daten werden importiert."
 
 #: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../shell/e-shell-importer.c:522
 msgid "Please wait"
 msgstr "Bitte warten"
 
@@ -19223,6 +20176,34 @@ msgstr "Betreffsbezogenes Threading der Nachrichten"
 msgid "F_all back to threading messages by subject"
 msgstr "Zurückfallen auf be_treffsbezogenes Threading der Nachrichten"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+#, fuzzy
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Liste der Begriffe, nach denen die Anlagenerinnerung im Text der Nachricht "
+"sucht."
+
+#: ../plugins/templates/templates.c:614
+#, fuzzy
+msgid "No title"
+msgstr "Tätigkeit"
+
+#: ../plugins/templates/templates.c:743
+#, fuzzy
+msgid "Save as _Template"
+msgstr "Als Entwurf speichern"
+
+#: ../plugins/templates/templates.c:745
+#, fuzzy
+msgid "Save as Template"
+msgstr "Als Entwurf speichern"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr ""
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "Ein Plugin, welches ytnef benutzt, um tnef-Anlagen zu dekodieren."
@@ -19248,119 +20229,115 @@ msgid "Evolution Test component"
 msgstr "Evolution-Testkomponente"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "Eine Textbeschreibung der derzeitigen Druckereinstellungen."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Authenticate proxy server connections"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 #, fuzzy
 msgid "Automatic proxy configuration URL"
 msgstr "Automatische Link-Erkennung"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Konfigurationsversion"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Decides whether the crash detection should be run or not."
 msgstr ""
 "Legt fest, ob die Wiederabsturzverhinderung gestartet werden soll oder nicht."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Voreingestellte Seitenleistenbreite"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "Voreingestellte Fensterhöhe"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "Voreingestllter Fensterzustand"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "Voreingestellte Fensterbreite"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 #, fuzzy
 msgid "HTTP proxy password"
 msgstr "Passwort eingeben"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy username"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 "Kennung oder Alias der Komponente, die per Vorgabe beim Start angezeigt "
 "werden soll."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username/password combo is defined by \"/apps/evolution/shell/network_config/"
 "authentication_user\" and locally stored password in .gnome2_private/."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
 msgstr "Zuletzt aktualisierte Konfigurationsversion"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Liste der Pfade für Ordner, die für eine Offline-Benutzung auf der Platte "
 "synchronisiert werden sollen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Non-proxy hosts"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 #, fuzzy
 msgid "Proxy configuration mode"
 msgstr "Konfiguration"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "SOCKS proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy host name"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Secure HTTP proxy port"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19368,27 +20345,27 @@ msgid ""
 "\" respectively."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "Seitenleiste anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "Entwicklungs-Warndialog nicht anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
 msgstr "Absturzverhinderung-Warndialog nicht anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30 ../shell/main.c:576
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
 msgid "Start in offline mode"
 msgstr "Im Offline-Modus starten"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "Statusleiste ist sichtbar"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19396,19 +20373,19 @@ msgstr ""
 "Die Konfigurationsversion von Evolution mit Haupt-, Unter- und "
 "Konfigurations-Stufe (z.B. »2.6.0«)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default height for the main window, in pixels."
 msgstr "Die Vorgabehöhe des Hauptfensters in Pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "The default width for the main window, in pixels."
 msgstr "Die Vorgabebreite des Hauptfensters in Pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "Die Vorgabebreite der Seitenleiste in Pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19416,47 +20393,47 @@ msgstr ""
 "Die zuletzt aktualisierte Konfigurationsversion von Evolution mit Haupt-, "
 "Unter- und Konfigurations-Stufe (z.B. »2.6.0«)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid "The machine name to proxy secure HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy socks through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
-"Der Stil der Fensterknöpfe. Mögliche Einstellungen sind »text«, »icons«, "
-"»both« und »toolbar«. Wenn »toolbar« gesetzt wurde, wird der Stil anhand der "
-"GNOME-Einstellungen festgelegt."
+"Der Stil der Fensterknöpfe. Mögliche Einstellungen sind »text«, »icons«, »both« "
+"und »toolbar«. Wenn »toolbar« gesetzt wurde, wird der Stil anhand der GNOME-"
+"Einstellungen festgelegt."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -19464,70 +20441,70 @@ msgid ""
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "Werkzeugleiste anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 #, fuzzy
 msgid "URL that provides proxy configuration values."
 msgstr "Zuletzt aktualisierte Konfigurationsversion"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Soll Evolution im Offline- statt im Online-Modus gestartet werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether crash detection should be done or not"
 msgstr ""
 "Legt fest, ob die Wiederabsturzverhinderung durchgeführt werden soll oder "
 "nicht"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether or not the window should be maximized."
 msgstr "Soll das Fenster maximiert werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "Soll die Seitenleiste angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the status bar should be visible."
 msgstr "Soll die Werkzeugleiste angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
 msgstr "Soll die Werkzeugleiste angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Soll der Warndialog in Evolution-Entwicklerversionen nicht angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in recovery of Evolution is skipped."
 msgstr ""
 "Legt fest, ob der Warndialog der Wiederabsturzverhinderung angezeigt werden "
 "soll."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "Sollen die Fensterknöpfe angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Fensterknopfstil"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Fensterknöpfe sind sichtbar"
 
@@ -19544,11 +20521,11 @@ msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Klicken Sie auf OK, um diese Verbindungen zu schließen und offline zu gehen"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:132
 msgid "Choose the type of importer to run:"
 msgstr "Wählen Sie den auszuführenden Importeur:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -19559,14 +20536,14 @@ msgstr ""
 "Wählen Sie die Datei, die Sie in Evolution importieren wollen und legen Sie "
 "anhand der Liste den Dateityp fest.\n"
 "\n"
-"Falls er Ihnen unbekannt ist, können Sie »Automatisch« wählen. Evolution "
-"wird dann versuchen, ihn selbst zu bestimmen."
+"Falls er Ihnen unbekannt ist, können Sie »Automatisch« wählen. Evolution wird "
+"dann versuchen, ihn selbst zu bestimmen."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid "Choose the destination for this import"
 msgstr "Wählen Sie das Ziel dieses Imports"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:147
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -19579,80 +20556,60 @@ msgstr ""
 "gefunden. Klicken Sie bitte den »Zurück«-Knopf an, falls\n"
 "Sie es noch einmal versuchen wollen.\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Datei_name:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Eine Datei wählen"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:299
 msgid "File _type:"
 msgstr "Datei_typ:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:335
 msgid "Import data and settings from _older programs"
 msgstr "Daten und Einstellungen aus ä_lteren Programmen importieren"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:338
 msgid "Import a _single file"
 msgstr "Eine _einzelne Datei importieren"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-settings-dialog.c:314
 msgid "Evolution Preferences"
 msgstr "Evolution-Einstellungen"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Kein Ordnername angegeben."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Ordnername darf das Return-Zeichen nicht enthalten."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Ordnername darf das Slash-Zeichen »/« nicht enthalten."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Ordnername darf das Raute-Zeichen »#« nicht enthalten."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' und '..' sind reservierte Ordnernamen."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "Die GNOME-Pilot-Werkzeuge scheinen auf diesem System nicht installiert zu "
 "sein."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "Fehler beim Ausführen von %s."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "Bug-Buddy ist nicht installiert."
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "Bug-Buddy konnte nicht gestartet werden."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:744
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Kai Lahmann <kl@linuxfaqs.de>\n"
@@ -19664,75 +20621,81 @@ msgstr ""
 "Christian Kintner <mail@christian-kintner.de>\n"
 "Andre Klapper <ak-47@gmx.net>"
 
-#: ../shell/e-shell-window-commands.c:755
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Evolution-Webseite"
 
-#: ../shell/e-shell-window-commands.c:773
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Fehler beim Öffnen der FAQ-Webseite."
 
-#: ../shell/e-shell-window-commands.c:970
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: ../shell/e-shell-window-commands.c:983 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "_Offline arbeiten"
 
-#: ../shell/e-shell-window-commands.c:996
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:377
+#, fuzzy
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
 "Evolution ist im Augenblick online. Klicken Sie auf diesen Knopf, um offline "
 "zu arbeiten."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution geht gerade offline."
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:391
+#, fuzzy
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
 "Evolution ist im Augenblick offline. Klicken Sie auf diesen Knopf, um online "
 "zu arbeiten."
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:780
 #, c-format
 msgid "Switch to %s"
 msgstr "Zu %s wechseln"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:638
 msgid "Unknown system error."
 msgstr "Unbekannter Systemfehler."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1280
 msgid "Invalid arguments"
 msgstr "Ungültige Argumente"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1282
 msgid "Cannot register on OAF"
 msgstr "Registrierung bei OAF konnte nicht stattfinden"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1284
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatenbank nicht gefunden"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "Neu"
 
@@ -19789,7 +20752,7 @@ msgstr ""
 "Dateien in Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:222
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19828,7 +20791,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen das Ergebnis unserer harten Arbeit\n"
 "gefällt und freuen uns auf Ihren Beitrag zu diesem Projekt!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19836,19 +20799,19 @@ msgstr ""
 "Vielen Dank\n"
 "Das Evolution-Team\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:253
 msgid "Do not tell me again"
 msgstr "Nicht mehr anzeigen"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:303
 msgid "Evolution Crash Detection"
 msgstr "Evolution-Wiederabsturzverhinderung"
 
-#: ../shell/main.c:316
+#: ../shell/main.c:305
 msgid "Ig_nore"
 msgstr "Ig_norieren"
 
-#: ../shell/main.c:331
+#: ../shell/main.c:320
 #, no-c-format
 msgid ""
 "Evolution appears to have exited unexpectedly the last time it was\n"
@@ -19860,39 +20823,39 @@ msgstr ""
 "nicht angezeigt. Dieser kann wieder unter dem Menüpunkt\n"
 "»Ansicht« aktiviert werden.\n"
 
-#: ../shell/main.c:342
+#: ../shell/main.c:331
 msgid "_Do not show this message again"
 msgstr "Diese _Meldung nicht mehr anzeigen"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:563
 msgid "Start Evolution activating the specified component"
 msgstr "Beim Start von Evolution die angegebene Komponente aktivieren"
 
-#: ../shell/main.c:578
+#: ../shell/main.c:567
 msgid "Start in online mode"
 msgstr "Im Online-Modus starten"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:570
 msgid "Forcibly shut down all Evolution components"
 msgstr "Alle Evolution-Komponenten dazu zwingen, herunterzufahren"
 
-#: ../shell/main.c:585
+#: ../shell/main.c:574
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Remigrierung von Evolution 1.4 erzwingen"
 
-#: ../shell/main.c:588
+#: ../shell/main.c:577
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: ../shell/main.c:590
+#: ../shell/main.c:579
 msgid "Disable loading of any plugins."
 msgstr "Das Laden von allen Plugins deaktivieren."
 
-#: ../shell/main.c:592
+#: ../shell/main.c:581
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Die Vorschau von E-Mails, Kontakten und Aufgaben deaktivieren."
 
-#: ../shell/main.c:677
+#: ../shell/main.c:666
 msgid "- The Evolution PIM and Email Client"
 msgstr "– Die Evolution PIM- und E-Mail-Anwendung"
 
@@ -19951,8 +20914,8 @@ msgid ""
 "Once deleted, you cannot downgrade to the previous version of Evolution "
 "without manual intervention.\n"
 msgstr ""
-"Sie sind im Begriff, den gesamten Inhalt des Ordners »evolution« dauerhaft "
-"zu löschen.\n"
+"Sie sind im Begriff, den gesamten Inhalt des Ordners »evolution« dauerhaft zu "
+"löschen.\n"
 "\n"
 "Es ist empfehlenswert, vor dem Löschen der alten Daten manuell "
 "sicherzustellen, dass alle E-Mail-, Kontakt- und Kalenderdaten vorhanden "
@@ -19974,9 +20937,9 @@ msgstr ""
 "gespeichert.\n"
 "\n"
 "Falls Sie sich dafür entscheiden, diese Daten zu entfernen, gehen die "
-"gesamten Daten im Ordner »evolution« dauerhaft verloren. Falls Sie sich "
-"dafür entscheiden, diese Daten beizubehalten, können Sie den Inhalt von "
-"»evolution« jederzeit manuell entfernen.\n"
+"gesamten Daten im Ordner »evolution« dauerhaft verloren. Falls Sie sich dafür "
+"entscheiden, diese Daten beizubehalten, können Sie den Inhalt von »evolution« "
+"jederzeit manuell entfernen.\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
@@ -20046,7 +21009,7 @@ msgstr ""
 "Falls Sie sich dafür entscheiden, fortzufahren, können Sie möglicherweise "
 "auf einen Teil Ihrer alten Daten nicht mehr zugreifen.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20057,7 +21020,7 @@ msgstr ""
 "\n"
 "Einstellungen zur Vertrauenswürdigkeit bearbeiten:"
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:151
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20067,7 +21030,7 @@ msgstr ""
 "hat. Daher vertrauen Sie der Authentizität dieses Zertifikats, falls Sie es "
 "hier nicht anders angeben."
 
-#: ../smime/gui/cert-trust-dialog.c:158
+#: ../smime/gui/cert-trust-dialog.c:155
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20125,11 +21088,16 @@ msgstr "E-Mail-Adresse"
 msgid "All CA certificate files"
 msgstr "Alle CA-Zertifikatdateien"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:339
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Zertifikatbetrachter: %s"
 
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Geben Sie das Passwort für »%s« ein"
+
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -20140,7 +21108,7 @@ msgid "Enter new password"
 msgstr "Neues Passwort eingeben"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:115
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20149,7 +21117,7 @@ msgstr ""
 "Ausgestellt auf:\n"
 "      Empfänger: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20158,7 +21126,7 @@ msgstr ""
 "Aussteller:\n"
 "      Empfänger: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:168
 msgid "Select certificate"
 msgstr "Zertifikat wählen"
 
@@ -20349,7 +21317,7 @@ msgid "_Edit CA Trust"
 msgstr "CA-Vertrauenswürdigkeit _bearbeiten"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:673
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "Zertifikat existiert bereits"
 
@@ -20559,8 +21527,7 @@ msgstr "Kontakte _kopieren nach …"
 msgid "Contact _Preview"
 msgstr "Kontakt_vorschau"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopieren"
@@ -20585,8 +21552,7 @@ msgstr "In Ordner kopieren …"
 msgid "Create a new addressbook folder"
 msgstr "Einen neuen Adressbuchordner anlegen"
 
-#: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Ausschneiden"
@@ -20627,8 +21593,7 @@ msgstr "Die Kontakte des gewählten Ordners in einen anderen Ordner verschieben"
 msgid "Move to Folder..."
 msgstr "In Ordner verschieben …"
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Einfügen"
@@ -20665,13 +21630,11 @@ msgstr "Die gewählten Kontakte als VCard speichern."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Die Kontakte des gewählten Ordners als VCard speichern"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "Alle auswählen"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "_Alle auswählen"
 
@@ -20801,7 +21764,7 @@ msgid "Month"
 msgstr "Monat"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Weiter"
 
@@ -20810,7 +21773,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Eine Vorschau auf den zu druckenden Kalender anzeigen"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Vorherige"
 
@@ -20878,232 +21841,6 @@ msgstr "Arbeitswoche"
 msgid "_Open Appointment"
 msgstr "Termin ö_ffnen"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Den markierten Text in die Zwischenablage kopieren"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "Auswahl in die Zwischenablage kopieren"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Den markierten Text in die Zwischenablage verschieben"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "Auswahl in die Zwischenablage verschieben"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "Inhalt der Zwischenablage einfügen"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Den in der Zwischenablage befindlichen Text einfügen"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Den gesamten Text markieren"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Beilegen"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Klicken Sie hier, um eine Datei beizulegen"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Klicken Sie hier, um das momentan geöffnete Fenster zu schließen"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Klicken Sie hier, um das momentan geöffnete Fenster zu speichern"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Klicken Sie hier, um die verfügbare Hilfe anzuzeigen"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Schließen"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "Ein_fügen"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "_Anlage …"
-
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "S_chließen"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:53
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Datei"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_Hilfe"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Optionen"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Ganztägiges Ereignis"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "_Ganztägiges Ereignis"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Als vertraulich einstufen"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Als privat einstufen"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Als öffentlich einstufen"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Klicken Sie hier, um Alarme für dieses Ereignis einzustellen"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Erweiterte Versandoptionen einfügen"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Dies zu einem wiederkehrenden Ereignis machen"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Ö_ffentlich"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Verfügbarkeitsinformationen der Teilnehmer abfragen"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "_Positions-Feld"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "_Sendeoptionen"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Zeit als b_eschäftigt anzeigen"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Zeit_zone"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Feld für die Teilnehmerart angezeigen/verbergen"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "UAwg-Feld angezeigen/verbergen"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Feld für die Position angezeigen/verbergen"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Statusfeld anzeigen/verbergen"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Zeitzone anzeigen/verbergen"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Kategorien anzeigen/verbergen"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Festlegen, ob es ein ganztägiges Ereinis ist"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Festlegen, ob die Zeit als beschäftigt angezeigt wird"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Alarme"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Kategorien"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "E_instufung"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "Ver_traulich"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Verfügbarkeit"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Privat"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_UAwg"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Wiederholung"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "_Statusfeld"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "A_rt-Feld"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Den momentan ausgeführten E-Mail-Vorgang abbrechen"
@@ -21135,7 +21872,6 @@ msgid "Empty _Trash"
 msgstr "_Müll leeren"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Ordner"
 
@@ -21812,9 +22548,9 @@ msgstr "Ansicht ver_größern"
 msgid "_Zoom In"
 msgstr "Ansicht ver_größern"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Dieses Fenster schließen"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Schließen"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -21852,293 +22588,6 @@ msgstr "Die gewählte Notiz anzeigen"
 msgid "_Open Memo"
 msgstr "Notiz ö_ffnen"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Eine Datei beilegen"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "Die momentan geöffnete Datei schließen"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "Alles außer Signatur löschen"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "Diese Nachricht mit PGP verschlüsseln"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr ""
-"Diese Nachricht mit Ihrem S/MIME-Verschlüsselungszertifikat verschlüsseln"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "_Format"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr ""
-"Eine Zustellungsbestätigung erhalten, sobald Ihre Nachricht gelesen wurde"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "_HTML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "Versandoptionen einfügen"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "Eine Datei öffnen"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "Mit PGP verschlüsseln"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "Mit PGP signieren"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "Mit P_GP verschlüsseln"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "Mit _PGP signieren"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "_Lesebestätigung anfordern"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "Mit S/_MIME verschlüsseln"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "Mit S/MIME verschlüsseln"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "Mit _S/MIME signieren"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "Mit S/MIME signieren"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "A_bschicken"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "Speichern unter"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "Entwurf speichern"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "Speichern _unter …"
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "_Entwurf speichern"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "Als Entwurf speichern"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "In Ordner speichern …"
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "Die momentan geöffnete Datei speichern"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "Die momentan geöffnete Datei unter einem anderem Namen speichern"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "Die Nachricht in einem bestimmten Ordner speichern"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "Abschicken"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "Diese E-Mail im HTML-Format verschicken"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "Diese Nachricht verschicken"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "Die Priorität der Nachricht auf hoch setzen"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "Diese Nachricht mit PGP signieren"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Diese Nachricht mit Ihrem S/MIME-Signaturzertifikat signieren"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "Blindkopie-Feld anzeigen/verbergen"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "Kopie-Feld anzeigen/verbergen"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Von-Wähler anzeigen/verbergen"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Veröffentlichen-in-Feld anzeigen/verbergen"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Antwort-an-Feld anzeigen/verbergen"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "An-Feld anzeigen/verbergen"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "_Blindkopie-Feld"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "_Kopie-Feld"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "Alle _löschen"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "_Von-Feld"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "Ö_ffnen …"
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "V_eröffentlichen-in-Feld"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "Nachricht _priorisieren"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "An_twort-an-Feld"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "_Sicherheit"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "_Versandoptionen"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "A_n-Feld"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "S_chließen"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "_HTML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "Speichern und schließen"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Speichern und s_chließen"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "Die momentan geöffnete Datei speichern und das Fenster schließen"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Ordner zu Ihrer Liste abonnierter Ordner hinzufügen"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Liste auffrischen"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Ordnerliste auffrischen"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Ordner aus Ihrer Liste abonnierter Ordner entfernen"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Abonnieren"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Abbestellen"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Auswahl _umkehren"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr ""
-"Klicken Sie hier, um die Statusdetails der Aufgabe anzusehen oder zu ändern"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Statusdetails"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Zeitzone"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "S_tatusdetails"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Die gewählten Aufgaben kopieren"
@@ -22454,11 +22903,11 @@ msgid "With _Status"
 msgstr "Mit _Status"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
 msgid "UTC"
 msgstr "UTC"
 
@@ -22475,8 +22924,8 @@ msgid "Select a Time Zone"
 msgstr "Eine Zeitzone wählen"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "Zeitzonen-Auswahlliste"
+msgid "Timezone drop-down combination box"
+msgstr ""
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -22488,19 +22937,19 @@ msgstr ""
 "und wählen Sie eine Zeitzone.\n"
 "Mit der rechten Maustaste können Sie die Ansicht verkleinern."
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr "Sammlung"
 
-#: ../widgets/menus/gal-define-views-dialog.c:360
+#: ../widgets/menus/gal-define-views-dialog.c:358
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Ansichten für %s definieren"
 
+#: ../widgets/menus/gal-define-views-dialog.c:366
 #: ../widgets/menus/gal-define-views-dialog.c:368
-#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "Ansichten definieren"
 
@@ -22510,17 +22959,17 @@ msgid "Define Views for \"%s\""
 msgstr "Ansichten für »%s« definieren"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../widgets/table/e-table-scrolled.c:216
 #: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Tabelle"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "Instanz"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "Aktuelle Ansicht speichern"
 
@@ -22572,11 +23021,11 @@ msgstr "Aktuelle benutzerdefinierte Ansicht speichern"
 msgid "Create or edit views"
 msgstr "Ansicht er_stellen oder bearbeiten"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Fabrik"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Neue Ansicht definieren"
 
@@ -22592,17 +23041,17 @@ msgstr "Art der Ansicht"
 msgid "Type of view:"
 msgstr "Art der Ansicht:"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Anlagenleiste"
 
-#: ../widgets/misc/e-attachment.c:317 ../widgets/misc/e-attachment.c:332
-#: ../widgets/misc/e-attachment.c:533 ../widgets/misc/e-attachment.c:550
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Datei konnte nicht beigelegt werden: %s: %s"
 
-#: ../widgets/misc/e-attachment.c:325 ../widgets/misc/e-attachment.c:542
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Datei %s konnte nicht beigelegt werden: keine reguläre Datei"
@@ -22624,32 +23073,32 @@ msgid "Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage vorschlagen"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1099
+#: ../widgets/misc/e-calendar-item.c:1273
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "Monatskalender"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "Füllfarbe"
 
 #: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
+#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
+#: ../widgets/text/e-text.c:3659
 msgid "GDK fill color"
 msgstr "GDK-Füllfarbe"
 
 #: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "Getüpfelt füllen"
 
@@ -22674,29 +23123,29 @@ msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Mindestbreite"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Mindestbreite"
 
 #: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Abstand"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:291
 msgid "Now"
 msgstr "Jetzt"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:848
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Die Zeit muss folgendes Format haben: %s"
@@ -22705,153 +23154,152 @@ msgstr "Die Zeit muss folgendes Format haben: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschließlich) sein"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Central European"
 msgstr "Mitteleuropäisch"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Cyrillic"
 msgstr "Kyrillisch"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Thai"
 msgstr "Thai"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
 msgstr "Türkisch"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Western European"
 msgstr "Westeuropäisch"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European, New"
 msgstr "Westeuropäisch, neu"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
 msgid "Traditional"
 msgstr "Traditionell"
 
-#: ../widgets/misc/e-charset-picker.c:100
-#: ../widgets/misc/e-charset-picker.c:101
-#: ../widgets/misc/e-charset-picker.c:102
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
 msgstr "Vereinfacht"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:97
 msgid "Ukrainian"
 msgstr "Ukrainisch"
 
 # CHECK
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Visual"
 msgstr "Visuell"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:169
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Unbekannter Zeichensatz: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:214
 msgid "Character Encoding"
 msgstr "Zeichenkodierung"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:229
 msgid "Enter the character set to use"
 msgstr "Geben Sie den zu verwendenden Zeichensatz ein"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:336
 msgid "Other..."
 msgstr "Weitere …"
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:598
 msgid "Ch_aracter Encoding"
 msgstr "_Zeichenkodierung"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "Datum und Uhrzeit"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "Eingabefeld für das Datum"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "Diesen Knopf drücken, um den Kalender anzuzeigen"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:394
+#, fuzzy
+msgid "Drop-down combination box to select time"
 msgstr "Auswahlliste für die Zeit"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "_Jetzt"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "_Heute"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "Ungültiges Datum"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "Ungültige Zeitangabe"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "Ausgeklappt"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "Ist der Ausklapper ausgeklappt?"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "Text der Ausklapperbeschriftung"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "Unterstrich verwenden"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -22859,39 +23307,39 @@ msgstr ""
 "Legt fest, ob ein Unterstrich im Text anzeigt, dass das nächste Zeichen als "
 "Kürzelbuchstabe verwendet werden soll"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "Zwischen die Beschriftung und das Kind einzufügende Polsterung"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Beschriftungs-Widget"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 "Ein Widget, das anstatt der normalen Ausklapperbeschriftung angezeigt werden "
 "soll"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
 msgid "Expander Size"
 msgstr "Ausklappergröße"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
 msgid "Size of the expander arrow"
 msgstr "Größe des Ausklapppfeils"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Indikator-Polsterung"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Polsterung um Aufklapppfeil"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
-#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:748
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
@@ -22936,23 +23384,33 @@ msgstr "Derzeitiger Ordner"
 msgid "Current Message"
 msgstr "Derzeitige Nachricht"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:167
 msgid "Choose Image"
 msgstr "Bild wählen"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:625
 msgid "World Map"
 msgstr "Weltkarte"
 
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:627
+#, fuzzy
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
+"should instead select the timezone from the drop-down combination box below."
 msgstr ""
 "Mausbasiertes interaktives Kartenobjekt zur Auswahl der Zeitzone. "
 "Tastaturbenutzer sollten die Zeitzone stattdessen mit der Auswahlliste im "
 "unteren Bereich festlegen."
 
+#: ../widgets/misc/e-online-button.c:112
+#, fuzzy
+msgid "Online"
+msgstr "Eingebettet"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr ""
+
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Synchronisieren mit:"
@@ -22977,61 +23435,61 @@ msgstr "Rückfluss-Modell"
 msgid "Column width"
 msgstr "Spaltenbreite"
 
-#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "Suchen"
 
-#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "Klicken Sie hier, um den Suchtypen zu ändern"
 
-#: ../widgets/misc/e-search-bar.c:615
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "_Suchen"
 
-#: ../widgets/misc/e-search-bar.c:621
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "_Jetzt suchen"
 
-#: ../widgets/misc/e-search-bar.c:622
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "_Verwerfen"
 
-#: ../widgets/misc/e-search-bar.c:877
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "Objektkennung"
 
-#: ../widgets/misc/e-search-bar.c:884 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Text"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1018
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "An_zeigen: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "S_uchen: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1047
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " _in "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Cursor-Zeile"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Cursor-Spalte"
@@ -23048,7 +23506,7 @@ msgstr "Markierungsmodus"
 msgid "Cursor Mode"
 msgstr "Cursor-Modus"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:518
 msgid "When de_leted:"
 msgstr "Wenn ge_löscht:"
 
@@ -23072,10 +23530,6 @@ msgstr "<b>Statusverfolgung</b>"
 msgid "A_uto-delete sent item"
 msgstr "Gesendetes Element a_utomatisch löschen"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Einstufung"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "Ein gesendetes _Element erstellen, um Informationen zu verfolgen"
@@ -23182,14 +23636,14 @@ msgid "_When opened:"
 msgstr "_Wenn geöffnet:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (…)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:303
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
@@ -23234,23 +23688,23 @@ msgstr "Fokussierte Spalte"
 msgid "Unselected Column"
 msgstr "Nicht markierte Spalte"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "Durchgestrichene Spalte"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "Unterstrichene Spalte"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "Fette Spalte"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "Farbige Spalte"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "Spalte für Hintergrundfarbe"
 
@@ -23288,7 +23742,7 @@ msgid "A_vailable Fields:"
 msgstr "_Verfügbare Felder:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "Aufsteigend"
 
@@ -23301,7 +23755,7 @@ msgid "Clear _All"
 msgstr "Alles _entfernen"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "Absteigend"
 
@@ -23364,14 +23818,14 @@ msgstr "_Sortieren …"
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
 #: ../widgets/table/e-table-field-chooser-item.c:634
 #: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1886
+#: ../widgets/table/e-table-header-item.c:1887
 msgid "DnD code"
 msgstr "Ziehen und Ablegen-Code"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
 #: ../widgets/table/e-table-field-chooser-item.c:641
 #: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "Alle Kopfzeilen"
 
@@ -23405,295 +23859,492 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d Objekt)"
 msgstr[1] "%s (%d Objekt)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Wechselnde Zeilenfarben"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "Horizontales Zeichengitter"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "Vertikales Zeichengitter"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "Fokus zeichnen"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Cursor-Modus"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Markierungsmodell"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "Längenschwellwert"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "Einheitliche Zeilenhöhe"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "Eingefroren"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "Aktuelle Ansicht anpassen"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "A_ufsteigend sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "A_bsteigend sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "_Nicht sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "Nach diesem _Feld gruppieren"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "Nach Fäc_hern gruppieren"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "_Diese Spalte entfernen"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "Spalte hin_zufügen …"
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "Aus_richtung"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "_Optimal"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "Spalten for_matieren …"
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "A_ktuelle Ansicht anpassen …"
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "_Sortieren nach"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "Schriftbeschreibung"
 
-#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-header-item.c:1915
 #: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "Sortierinfos"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Baum"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Tabellenkopf"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Tabellenvorlage"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Cursor-Zeile"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-tree.c:3356
 msgid "Always search"
 msgstr "Immer suchen"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Klick zum Hinzufügen verwenden"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
 msgid "ETree table adapter"
 msgstr "ETree-Tabellenadapter"
 
 # CHECK
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3362
 msgid "Retro Look"
 msgstr "Retro-Look"
 
 # CHECK
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3363
 msgid "Draw lines and +/- expanders."
 msgstr "Linien und »+/-«-Ausklapper anzeigen."
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "Eingabemethoden"
 
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "Ereignisprozessor"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "Fett"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "Durchgestrichen"
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "Verankerung"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "Ausrichtung"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "Clip-Breite"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "Clip-Höhe"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "Clip-Rechteck füllen"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "X-Versatz"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Y-Versatz"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "Textbreite"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "Texthöhe"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "Ellipse verwenden"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "Ellipse"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "Zeilenumbruch"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "Zeichen umbrechen"
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "Max. Zeilen"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "Rahmen zeichnen"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "Zeilenumbruchzeichen erlauben"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "Hintergrund zeichnen"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "Knopf zeichnen"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "Cursor-Position"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "EM-Kontext"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "Handle-Popup"
 
+#, fuzzy
+#~ msgid ""
+#~ "'{0}' is a read-only calendar source. Change Calendar to one that can "
+#~ "accept appointments."
+#~ msgstr ""
+#~ "»{0}« ist ein schreibgeschützter Kalender. Wechseln Sie zur "
+#~ "Kalenderansicht und wählen Sie einen Kalender aus, der Termine "
+#~ "akzeptieren kann."
+
+#~ msgid "Unknown reason"
+#~ msgstr "Unbekannter Grund"
+
+#~ msgid "Open File"
+#~ msgstr "Datei öffnen"
+
+#~ msgid "Cannot open file &quot;{0}&quot;."
+#~ msgstr "Die Datei »{0}« konnte nicht geöffnet werden."
+
+#~ msgid "Enter a name for this signature."
+#~ msgstr "Geben Sie einen Namen für diese Signatur ein."
+
+#~ msgid "Name:"
+#~ msgstr "Name:"
+
+#~ msgid ""
+#~ "Are you sure you want to permanently remove all the deleted messages in "
+#~ "folder &quot;{0}&quot;?"
+#~ msgstr ""
+#~ "Sind Sie sicher, dass Sie alle gelöschten Nachrichten endgültig aus dem "
+#~ "Ordner »{0}« entfernen wollen?"
+
+#~ msgid "Delete &quot;{0}&quot;?"
+#~ msgstr "»{0}« löschen?"
+
+#~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+#~ msgstr "Nachrichten im Suchordner »{0}« löschen?"
+
+#~ msgid "Only on _Current Folder"
+#~ msgstr "Nur im der_zeitigen Ordner"
+
+#~ msgid "Enable attachment reminder plugin"
+#~ msgstr "Anlagenerinnerung-Plugin aktivieren"
+
+#~ msgid "Enable attachment reminder plugin."
+#~ msgstr "Anlagenerinnerung aktivieren."
+
+#~ msgid "Remind _missing attachments"
+#~ msgstr "An vergessene Anlagen _erinnern"
+
+#~ msgid "_Continue Editing"
+#~ msgstr "Nachricht _bearbeiten"
+
+#, fuzzy
+#~ msgid "All instances"
+#~ msgstr "Alle Instanzen"
+
+#, fuzzy
+#~ msgid "This instance"
+#~ msgstr "Nur diese Instanz"
+
+#~ msgid "There is no configuration option for this plugin."
+#~ msgstr "Für dieses Plugin bestehen keine Konfigurationsoptionen."
+
+#~ msgid "Gives an option to print from the composer."
+#~ msgstr ""
+#~ "Bereitstellung einer Möglichkeit zum Drucken von E-Mails aus dem Editor "
+#~ "heraus."
+
+#~ msgid "Print Message"
+#~ msgstr "Nachricht drucken"
+
+#~ msgid "Prints the message"
+#~ msgstr "Nachricht drucken"
+
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "Eine Textbeschreibung der derzeitigen Druckereinstellungen."
+
+#~ msgid "No folder name specified."
+#~ msgstr "Kein Ordnername angegeben."
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "Ordnername darf das Return-Zeichen nicht enthalten."
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "Ordnername darf das Slash-Zeichen »/« nicht enthalten."
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "Ordnername darf das Raute-Zeichen »#« nicht enthalten."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "'.' und '..' sind reservierte Ordnernamen."
+
+#~ msgid "Copy selection to clipboard"
+#~ msgstr "Auswahl in die Zwischenablage kopieren"
+
+#~ msgid "Cut selection to clipboard"
+#~ msgstr "Auswahl in die Zwischenablage verschieben"
+
+#~ msgid "Paste from clipboard"
+#~ msgstr "Inhalt der Zwischenablage einfügen"
+
+#~ msgid "All Day Event"
+#~ msgstr "Ganztägiges Ereignis"
+
+#~ msgid "Send _Options"
+#~ msgstr "_Sendeoptionen"
+
+#~ msgid "Delete all but signature"
+#~ msgstr "Alles außer Signatur löschen"
+
+#~ msgid "For_mat"
+#~ msgstr "_Format"
+
+#~ msgid "HT_ML"
+#~ msgstr "_HTML"
+
+#~ msgid "Open a file"
+#~ msgstr "Eine Datei öffnen"
+
+#~ msgid "PGP Encrypt"
+#~ msgstr "Mit PGP verschlüsseln"
+
+#~ msgid "PGP Sign"
+#~ msgstr "Mit PGP signieren"
+
+#~ msgid "S/MIME Encrypt"
+#~ msgstr "Mit S/MIME verschlüsseln"
+
+#~ msgid "S/MIME Sign"
+#~ msgstr "Mit S/MIME signieren"
+
+#~ msgid "Save As"
+#~ msgstr "Speichern unter"
+
+#~ msgid "Save Draft"
+#~ msgstr "Entwurf speichern"
+
+#~ msgid "Save in folder..."
+#~ msgstr "In Ordner speichern …"
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Die Nachricht in einem bestimmten Ordner speichern"
+
+#~ msgid "Send"
+#~ msgstr "Abschicken"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Diese E-Mail im HTML-Format verschicken"
+
+#~ msgid "_Delete all"
+#~ msgstr "Alle _löschen"
+
+#~ msgid "_Open..."
+#~ msgstr "Ö_ffnen …"
+
+#~ msgid "C_lose"
+#~ msgstr "S_chließen"
+
+#~ msgid "H_TML"
+#~ msgstr "_HTML"
+
+#~ msgid "Save and _Close"
+#~ msgstr "Speichern und s_chließen"
+
+#~ msgid "Save the current file and close the window"
+#~ msgstr "Die momentan geöffnete Datei speichern und das Fenster schließen"
+
+#~ msgid "Add folder to your list of subscribed folders"
+#~ msgstr "Ordner zu Ihrer Liste abonnierter Ordner hinzufügen"
+
+#~ msgid "Refresh List"
+#~ msgstr "Liste auffrischen"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Ordnerliste auffrischen"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Ordner aus Ihrer Liste abonnierter Ordner entfernen"
+
+#~ msgid "Subscribe"
+#~ msgstr "Abonnieren"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Abbestellen"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "Auswahl _umkehren"
+
+#~ msgid "Status Details"
+#~ msgstr "Statusdetails"
+
+#~ msgid "Time Zone"
+#~ msgstr "Zeitzone"
+
+#~ msgid "TimeZone Combobox"
+#~ msgstr "Zeitzonen-Auswahlliste"
+
 #~ msgid "Permission Denied."
 #~ msgstr "Erlaubnis verweigert."
 
@@ -23717,27 +24368,3 @@ msgstr "Handle-Popup"
 
 #~ msgid "_Versandoptionen"
 #~ msgstr "_Sendeoptionen"
-
-#~ msgid "Adds custom header to outgoing messages."
-#~ msgstr ""
-#~ "Fügt ausgehenden Nachrichten eine benutzerdefinierte Kopfzeile hinzu."
-
-#~ msgid "Custom Header"
-#~ msgstr "Benutzerdefinierte Kopfzeile"
-
-#~ msgid "_Custom Header"
-#~ msgstr "Benutzerdefinierte _Kopfzeile"
-
-#~ msgid "List of custom headers"
-#~ msgstr "Liste der benutzerdefinierten Kopfzeilen"
-
-#~ msgid ""
-#~ "The key specifies the list of custom headers that you can add to an "
-#~ "outgoing message. The format for specifying a Header and Header value is: "
-#~ "Name of the custom header followed by \"=\" and the values separated by "
-#~ "\";\""
-#~ msgstr ""
-#~ "Diese Liste legt die benutzerdefinierten Kopfzeilen fest, die ausgehenden "
-#~ "Nachrichten hinzugefügt werden können. Das Format für eine Kopfzeile und "
-#~ "ihren Wert ist: Name der Kopfzeile gefolgt von »=« und die Werte, die "
-#~ "durch ein Semikolon (»;«) getrennt werden"
diff --git a/po/es.po b/po/es.po
index c530402f07..dc8eb4c181 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-09 08:16+0000\n"
-"PO-Revision-Date: 2008-07-09 23:26+0200\n"
+"POT-Creation-Date: 2008-08-07 16:19+0000\n"
+"PO-Revision-Date: 2008-08-07 18:34+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -344,12 +344,12 @@ msgstr "activar"
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr ""
-"«{0}» es una fuente de libreta de direcciones de sólo lectura. Cambie a la "
-"vista de contactos y resalte una libreta de direcciones que pueda aceptar "
-"contactos."
+"«{0}» es una libreta de direcciones de sólo lectura y no se puede modificar. "
+"Seleccione una libreta de direcciones diferente de la barra lateral en la "
+"vista de contactos."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -398,12 +398,12 @@ msgstr "No es posible eliminar la libreta de direcciones."
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
 "Actualmente sólo puede acceder a la libreta de direcciones del sistema de "
-"GroupWise desde Evolution. Debe usar algún cliente de correo de GroupWise "
-"una sola vez, para obtener sus Contactos Frecuentes de GroupWise y las "
-"carpetas personales de contactos de GroupWise."
+"GroupWise desde Evolution. Use algún cliente de correo de GroupWise una sola "
+"vez para obtener sus Contactos frecuentes de GroupWise y las carpetas "
+"personales de contactos de GroupWise."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
@@ -527,10 +527,8 @@ msgstr ""
 "actualizarse a una versión soportada"
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid "You do not have enough permissions to delete contact in this Address Book."
-msgstr ""
-"No tiene suficientes permisos para borrar este contacto en esta Libreta de "
-"direcciones."
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "No tiene permisos para borrar este contacto en esta Libreta de direcciones."
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
@@ -569,7 +567,7 @@ msgstr "_Usar tal cual es"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -657,8 +655,9 @@ msgstr "Gestione sus certificados S/MIME aquí"
 #: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:311
-#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1455
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "En este equipo"
 
@@ -675,7 +674,7 @@ msgstr "En este equipo"
 #: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
 #: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
 #: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
-#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1055
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Privado"
 
@@ -686,6 +685,7 @@ msgid "On LDAP Servers"
 msgstr "En servidores LDAP"
 
 #: ../addressbook/gui/component/addressbook-component.c:229
+msgctxt "New"
 msgid "_Contact"
 msgstr "_Contacto"
 
@@ -694,6 +694,7 @@ msgid "Create a new contact"
 msgstr "Crea un contacto nuevo"
 
 #: ../addressbook/gui/component/addressbook-component.c:237
+msgctxt "New"
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
@@ -702,11 +703,12 @@ msgid "Create a new contact list"
 msgstr "Crea una lista de contactos nueva"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1192
+#: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
 #: ../addressbook/gui/component/addressbook-component.c:245
+msgctxt "New"
 msgid "Address _Book"
 msgstr "Libreta de _direcciones"
 
@@ -718,72 +720,72 @@ msgstr "Crea una libreta de direcciones nueva"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Falló al actualizar la configuración de la libreta o las carpetas."
 
-#: ../addressbook/gui/component/addressbook-config.c:315
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:516
+#: ../addressbook/gui/component/addressbook-config.c:517
 #: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../addressbook/gui/component/addressbook-config.c:618
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "Copiar la li_breta localmente para trabajar desconectado"
 
-#: ../addressbook/gui/component/addressbook-config.c:967
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.c:366
 #: ../calendar/gui/dialogs/calendar-setup.c:377
 #: ../calendar/gui/dialogs/calendar-setup.c:388
 #: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2366
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "General"
 
-#: ../addressbook/gui/component/addressbook-config.c:968
+#: ../addressbook/gui/component/addressbook-config.c:982
 #: ../addressbook/gui/widgets/e-addressbook-view.c:556
 #: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
-#: ../addressbook/gui/component/addressbook-config.c:972
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Información del servidor"
 
-#: ../addressbook/gui/component/addressbook-config.c:974
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: ../addressbook/gui/component/addressbook-config.c:977
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalles"
 
-#: ../addressbook/gui/component/addressbook-config.c:978
-#: ../mail/em-folder-browser.c:959
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "Búsqueda"
 
-#: ../addressbook/gui/component/addressbook-config.c:980
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../addressbook/gui/component/addressbook-config.c:1190
+#: ../addressbook/gui/component/addressbook-config.c:1204
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Propiedades de la libreta de direcciones"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migrando…"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrando «%s»:"
@@ -866,10 +868,10 @@ msgstr "Guardar como vCard…"
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:956
 #: ../calendar/gui/calendar-component.c:620
-#: ../calendar/gui/e-calendar-table.c:1387
+#: ../calendar/gui/e-calendar-table.c:1596
 #: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
 #: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
-#: ../mail/em-folder-tree.c:2095 ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -901,6 +903,7 @@ msgstr "Introduzca la contraseña para %s (usuario %s)"
 
 #: ../addressbook/gui/component/addressbook.c:215
 #: ../calendar/common/authentication.c:51
+#: ../plugins/google-account-setup/google-source.c:498
 #: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
@@ -1008,71 +1011,76 @@ msgstr "Siempre"
 msgid "Anonymously"
 msgstr "Anónimamente"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+msgid "B_rowse this book until limit reached"
+msgstr "_Examinar esta libreta hasta llegar al final"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "Básico"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "Nombre distintivo"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "Dirección de correo-e"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution usará esta dirección de correo-e para autenticarle con el servidor."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "Buscar bases de búsqueda posibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "_Inicio de sesión:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 #: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "Nunca"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Sin cifrado"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Uno"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 #: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "Filtro de búsqueda"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "_Base de búsqueda:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "_Filtro de búsqueda:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "Filtro de búsqueda"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1082,7 +1090,7 @@ msgstr ""
 "la búsqueda. Si esto no se modifica, la búsqueda por omisión se realizará "
 "sobre la clase de objetos de tipo «person»."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1090,7 +1098,7 @@ msgstr ""
 "Seleccionar esta opción significa que Evolution sólo conectará con su "
 "servidor LDAP si su servidor LDAP soporta SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1098,7 +1106,7 @@ msgstr ""
 "Seleccionar esta opción significa que Evolution sólo conectará con su "
 "servidor LDAP si su servidor LDAP soporta TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1108,23 +1116,23 @@ msgstr ""
 "Esto significa que su conexión será insegura, y que usted será vulnerable a "
 "fallos de seguridad."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Bases de búsqueda soportadas"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 #: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -1134,7 +1142,7 @@ msgstr ""
 "búsquedas empezarán. Si deja esto en blanco, la búsqueda empezará en la raíz "
 "del árbol de directorios."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -1146,7 +1154,7 @@ msgstr ""
 "«sub» incluirá todas las entradas por debajo de su base de búsqueda. Un "
 "ámbito de «uno» sólo incluirá las entradas un nivel bajo su base."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1154,7 +1162,7 @@ msgstr ""
 "Este es el nombre completo del servidor LDAP. Por ejemplo, «ldap.micompañia."
 "com»."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1162,7 +1170,7 @@ msgstr ""
 "Este es el máximo número de entradas para descargar.  Si pone este número "
 "demasiado alto ralentizará su libreta de direcciones."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1172,7 +1180,7 @@ msgstr ""
 "establecer esto a «Dirección de correo-e» requiere acceso anónimo a su "
 "servidor ldap."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1180,7 +1188,7 @@ msgstr ""
 "Este nombre que identificará este servidor en la lista de carpetas de "
 "Evolution. Es sólo para poder mostrarlo en pantalla. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -1190,35 +1198,35 @@ msgstr ""
 "Se ha proporcionado una lista de puertos estándar. Pregunte a su "
 "administrador del sistema qué puerto debería especificar."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "Usando «Nombre Distintivo» (ND)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "Usando dirección de correo-e"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Cuando sea posible"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "_Añadir libreta de direcciones"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "Límite de _descarga:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "_Buscar bases de búsqueda posibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "Método de _inicio de sesión:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:226
 #: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
@@ -1226,39 +1234,39 @@ msgstr "Método de _inicio de sesión:"
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "Á_mbito de búsqueda:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 #: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "_Tiempo de expiración:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "Usar _conexión segura:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "tarjetas"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
 #: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:715
 msgid "minutes"
 msgstr "minutos"
 
@@ -1364,7 +1372,7 @@ msgstr "Teléfono"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Trabajo"
 
@@ -1386,9 +1394,9 @@ msgid "_Birthday:"
 msgstr "_Cumpleaños:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1848
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
@@ -1491,7 +1499,7 @@ msgstr "Dirección"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:521
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
 #: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
@@ -2816,7 +2824,7 @@ msgstr "_Miembros"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
 #: ../addressbook/gui/widgets/e-addressbook-view.c:213
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:507
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Libro"
 
@@ -2861,14 +2869,15 @@ msgstr ""
 "El nombre o la dirección de correo-e de este contacto ya existe\n"
 "en esta carpeta.  ¿Quiere añadirlo de todos modos?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:185
-msgid "Merge Contact"
-msgstr "Combinar contacto"
-
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
 #: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "Co_mbinar"
 
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "Combinar contacto"
+
 #: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
@@ -2910,7 +2919,7 @@ msgstr[1] "%d contactos"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-addressbook-view.c:227
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:514
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Consulta"
 
@@ -2921,7 +2930,7 @@ msgstr "Error al obtener la vista de libro"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-table.c:3353
 #: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
@@ -2953,8 +2962,8 @@ msgid "Save as vCard..."
 msgstr "Guardar como vCard…"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:1124
-#: ../calendar/gui/e-calendar-table.c:1365
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1574
 #: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
@@ -3005,19 +3014,18 @@ msgid "Mo_ve to Address Book..."
 msgstr "Mo_ver a la libreta de direcciones…"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "Cor_tar"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:453
-#: ../calendar/gui/e-calendar-table.c:1373
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1582
 #: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:996
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2045
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copiar"
 
@@ -3214,11 +3222,11 @@ msgstr "Sitio web"
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
 #: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Anchura"
@@ -3229,11 +3237,11 @@ msgstr "Anchura"
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
 #: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Altura"
@@ -3263,7 +3271,17 @@ msgstr "Longitud máx. del campo"
 msgid "Column Width"
 msgstr "Anchura de columna"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:173
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Buscando contactos..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3277,7 +3295,7 @@ msgstr ""
 "\n"
 "o pulse dos veces aquí para crear un contacto nuevo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:176
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3291,7 +3309,7 @@ msgstr ""
 "\n"
 "Pulse dos veces aquí para crear un contacto nuevo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3301,7 +3319,7 @@ msgstr ""
 "\n"
 "Buscar contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3311,7 +3329,7 @@ msgstr ""
 "\n"
 "No hay elementos para mostrar en esta vista."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:500
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adaptador"
 
@@ -3341,7 +3359,7 @@ msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en el navegador"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "_Copiar dirección del enlace"
 
@@ -3405,8 +3423,7 @@ msgstr "Calendario"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "Disponibilidad"
 
@@ -3428,13 +3445,13 @@ msgid "Web Log"
 msgstr "Diario web"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2355
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
 #: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Cumpleaños"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2356
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
 #: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Aniversario"
@@ -3481,7 +3498,7 @@ msgstr "No hay definido un contacto para sí mismo"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -3506,8 +3523,8 @@ msgstr "Protocolo no implementado"
 #: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -3978,7 +3995,7 @@ msgstr "Escala de grises"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1055
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -4105,20 +4122,20 @@ msgstr "Error no tratado"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
-"«{0}» es una fuente de calendario de sólo lectura. Cambie el Calendario a uno "
-"que pueda aceptar citas."
+"«{0}» es un calendario de sólo lectura y no se puede modificar. Seleccione un "
+"calendario diferente de la barra lateral en la vista del calendario."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
-"«{0}» es una fuente de calendario de sólo lectura. Cambie a la vista de "
-"calendario y resalte un calendario que pueda aceptar citas."
+"«{0}» es calendario de sólo lectura y no se puede modificar. Seleccione un "
+"calendario diferente que pueda aceptar citas."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
@@ -4371,8 +4388,8 @@ msgid "The calendar is not marked for offline usage."
 msgstr "El calendario no está marcado para usarse sin conexión."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
-msgstr "La lista de notas no está marcada para usarse sin conexión"
+msgid "The memo list is not marked for offline usage."
+msgstr "La lista de notas no está marcada para usarse sin conexión."
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
@@ -4461,12 +4478,11 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Sus tareas no estarán disponibles hasta que reinicie Evolution."
 
 #: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Descartar cambios"
 
 #: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
-#: ../ui/evolution-editor.xml.h:23
 msgid "_Save"
 msgstr "_Guardar"
 
@@ -4475,7 +4491,7 @@ msgid "_Save Changes"
 msgstr "_Guardar cambios"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Enviar"
@@ -4531,7 +4547,7 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "No es posible escribir el bloque de aplicación ToDo del Pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2357
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "Calendario y tareas"
 
@@ -4585,8 +4601,8 @@ msgid "Memos"
 msgstr "Notas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
+#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1982
 #: ../calendar/gui/tasks-component.c:540
 #: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
 #: ../calendar/gui/tasks-control.c:508
@@ -4625,7 +4641,7 @@ msgstr[1] "minutos"
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:397
+#: ../plugins/google-account-setup/google-source.c:716
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "hora"
@@ -4642,10 +4658,10 @@ msgstr "Citas"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1595
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1600
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
 #: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1002
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Lugar:"
 
@@ -4654,14 +4670,15 @@ msgid "Snooze _time:"
 msgstr "_Posponer durante:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -4673,32 +4690,32 @@ msgstr "_Posponer"
 msgid "location of appointment"
 msgstr "lugar de la cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1577
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
 msgid "No summary available."
 msgstr "No hay resumen disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No description available."
 msgstr "No hay descripción disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1478
 msgid "No location information available."
 msgstr "No hay información del lugar disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
 #, c-format
 msgid "You have %d alarms"
 msgstr "Tiene %d alertas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1707
-#: ../mail/mail-component.c:1584
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1684
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1712
+#: ../mail/mail-component.c:1587
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4710,7 +4727,7 @@ msgstr ""
 "configurado para enviar un mensaje de correo-e.  En su lugar\n"
 "Evolution mostrará un diálogo de recordatorio normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1713
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4727,7 +4744,7 @@ msgstr ""
 "\n"
 "¿Está seguro que quiere ejecutar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1732
 msgid "Do not ask me about this program again."
 msgstr "No preguntar otra vez sobre este programa."
 
@@ -5022,12 +5039,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Mostrar el campo de estado en el editor de acontecimientos/tareas/reuniones"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Mostrar el panel de vista previa"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Mostrar el panel de vista previa."
 
@@ -5306,7 +5323,7 @@ msgstr "Purgar acontecimientos anteriores a"
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
 #: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:717
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "días"
@@ -5338,14 +5355,14 @@ msgstr "Calendario _nuevo"
 
 #: ../calendar/gui/calendar-component.c:617
 #: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
-#: ../mail/em-folder-tree.c:2090
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Copiar…"
 
 #: ../calendar/gui/calendar-component.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:1126
+#: ../calendar/gui/dialogs/comp-editor.c:2034
 #: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2104
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Propiedades"
@@ -5372,6 +5389,7 @@ msgid "New appointment"
 msgstr "Cita nueva"
 
 #: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
 msgid "_Appointment"
 msgstr "_Cita"
 
@@ -5384,6 +5402,7 @@ msgid "New meeting"
 msgstr "Reunión nueva"
 
 #: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
 msgid "M_eeting"
 msgstr "_Reunión"
 
@@ -5396,6 +5415,7 @@ msgid "New all day appointment"
 msgstr "Cita nueva para todo el día"
 
 #: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Cita para todo el _día"
 
@@ -5408,6 +5428,7 @@ msgid "New calendar"
 msgstr "Calendario nuevo"
 
 #: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
@@ -5468,7 +5489,7 @@ msgid "Competition"
 msgstr "Completado"
 
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:340
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:547
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Confidential"
 msgstr "Confidencial"
@@ -5561,20 +5582,19 @@ msgid "Phone Calls"
 msgstr "Llamadas de teléfono"
 
 #: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:339
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:546
 #: ../calendar/gui/memotypes.xml.h:29
 msgid "Private"
 msgstr "Privado"
 
 #: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
 #: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:338 ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
 msgid "Public"
 msgstr "Público"
 
 #: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
+#: ../calendar/gui/dialogs/event-editor.c:298
 msgid "Recurrence"
 msgstr "Repetición"
 
@@ -5596,7 +5616,7 @@ msgstr "Estrategias"
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
-#: ../calendar/gui/tasktypes.xml.h:40 ../mail/mail-dialogs.glade.h:20
+#: ../calendar/gui/tasktypes.xml.h:40
 #: ../plugins/save-calendar/csv-format.c:361
 msgid "Summary"
 msgstr "Resumen"
@@ -5662,7 +5682,7 @@ msgstr "Permiso denegado para abrir el calendario"
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:605
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "Editar alerta"
 
@@ -5765,7 +5785,10 @@ msgstr "veces adicionales cada"
 msgid "hour(s)"
 msgstr "hora(s)"
 
+#. Translators: This is the second half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:247
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -5784,7 +5807,6 @@ msgstr "Aña_dir"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alertas"
 
@@ -5862,7 +5884,7 @@ msgid "Display"
 msgstr "Mostrar"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "viernes"
@@ -5878,7 +5900,7 @@ msgstr ""
 "días"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "lunes"
@@ -5902,7 +5924,7 @@ msgstr ""
 "domingo"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Elija un color"
 
@@ -5912,7 +5934,7 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "sábado"
@@ -5930,7 +5952,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Mostrar los _números de las semanas en el navegador de fechas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "domingo"
@@ -5949,7 +5971,7 @@ msgid "Template:"
 msgstr "Plantilla:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "jueves"
@@ -5964,13 +5986,13 @@ msgid "Time format:"
 msgstr "Formato de la hora:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "martes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "miércoles"
@@ -6147,39 +6169,39 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No ha realizado cambios, ¿quiere actualizar el editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:516
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Error de validación: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:185 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " a "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr "(Completado "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "Completado "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (Vence "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "Vence "
 
-#: ../calendar/gui/dialogs/comp-editor.c:205
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "Mensaje adjunto: %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:210
-#: ../calendar/gui/dialogs/comp-editor.c:383 ../composer/e-msg-composer.c:1772
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
 #: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
@@ -6187,117 +6209,259 @@ msgid_plural "%d attached messages"
 msgstr[0] "Mensaje adjunto"
 msgstr[1] "%d mensajes adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:454 ../composer/e-msg-composer.c:2059
-#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2046
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:456 ../composer/e-msg-composer.c:2061
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2048
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "Cancelar _arrastre"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
-#: ../calendar/gui/dialogs/comp-editor.c:2854 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
 #: ../plugins/prefer-plain/prefer-plain.c:74
-#: ../widgets/misc/e-attachment-bar.c:484
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "adjunto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:821
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "No es posible actualizar el objeto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:971
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "Editar cita"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "Reunión: %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "Cita: %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tarea asignada: %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "Tarea: %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "Nota - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "Sin resumen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "Pulse aquí para cerrar la ventana actual"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "Copia el texto seleccionado al portapapeles"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "Corta el texto seleccionado al portapapeles"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "Pulse aquí para ver la ayuda disponible"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "Pega texto desde el portapapeles"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "Pulse aquí para guardar la vista actual"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "Selecciona todo el texto"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "_Clasificación"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_Archivo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "Ay_uda"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "_Insertar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "_Opciones"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
+msgid "_View"
+msgstr "_Ver"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_Adjunto…"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "Pulse aquí para adjuntar un archivo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "_Categorías"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "Conmuta cuando se muestran las categorías"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "_Zona horaria"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "Conmuta cuando se muestra la «Zona horaria»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "Pú_blico"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "Clasificar como público"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "_Privado"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "Clasificar como privado"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "Clasificar como confidencial"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "Campo «_Rol»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "Conmuta cuando se muestra el campo «Rol»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "_Confirmar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Conmuta cuando se muestra el campo «Confirmar»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "Campo de _estado"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "Conmuta cuando se muestra el campo «Estado»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "Campo de _tipo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Conmuta indicando si se muestra el campo «Tipo de participante»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "Docu_mentos recientes"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "Adjuntar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> adjunto"
 msgstr[1] "<b>%d</b> adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1003
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "Ocultar _barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1006
-#: ../calendar/gui/dialogs/comp-editor.c:1589
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "Mostrar _barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
-#: ../calendar/gui/dialogs/event-page.c:1964
-#: ../calendar/gui/dialogs/task-page.c:1261 ../composer/e-msg-composer.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:2036
 #: ../composer/e-msg-composer.c:1049
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Añadir adjunto…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1613
-#: ../mail/em-format-html-display.c:2196
+#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../mail/em-format-html-display.c:2194
 msgid "Show Attachments"
 msgstr "Mostrar adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1614
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "Pulse la barra espaciadora para cambiar la barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2225
-#: ../calendar/gui/dialogs/comp-editor.c:2268
-msgid "Edit Appointment"
-msgstr "Editar cita"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2231
-#: ../calendar/gui/dialogs/comp-editor.c:2274
-#, c-format
-msgid "Meeting - %s"
-msgstr "Reunión: %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Appointment - %s"
-msgstr "Cita: %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2237
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Tarea asignada: %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Task - %s"
-msgstr "Tarea: %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2242
-#: ../calendar/gui/dialogs/comp-editor.c:2285
-#, c-format
-msgid "Memo - %s"
-msgstr "Nota - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2253
-#: ../calendar/gui/dialogs/comp-editor.c:2295
-msgid "No summary"
-msgstr "Sin resumen"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2943
-#: ../calendar/gui/dialogs/comp-editor.c:2997
-#: ../calendar/gui/dialogs/comp-editor.c:3021
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Los cambios efectuados a este elemento pueden descartarse si llega una "
 "actualización por correo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "Imposible usar la versión actual."
 
@@ -6378,127 +6542,178 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Introducir un delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "_Alertas"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr "Pulse aquí para poner o quitar alertas para este acontecimiento"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "_Repetición"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "Convertir en acontecimiento repetitivo"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Opciones de envío"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "Opciones de envío avanzadas"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "Acontecimiento para todo el _día"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "Se activa cuando se tiene un «Acontecimiento para todo el día»"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "Mostrar hora como _ocupada"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "Se activa cuando se deben mostrar la hora como ocupada"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "_Disponibilidad"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "Consultar información de disponibilidad para los participantes"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "_Cita"
 
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.c:2832
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "Este acontecimiento tiene alertas."
 
-#: ../calendar/gui/dialogs/event-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:941
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:943
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:1125
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "Acontecimiento sin fecha de inicio"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "Acontecimiento sin fecha de finalización"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
-#: ../calendar/gui/dialogs/memo-page.c:729
-#: ../calendar/gui/dialogs/task-page.c:888
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "La fecha de inicio está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1310
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "La fecha de finalización está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1333
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "La hora de inicio está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1340
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "La hora de finalización está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1502
-#: ../calendar/gui/dialogs/memo-page.c:769
-#: ../calendar/gui/dialogs/task-page.c:947
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "El organizador seleccionado ya no tiene una cuenta."
 
-#: ../calendar/gui/dialogs/event-page.c:1508
-#: ../calendar/gui/dialogs/memo-page.c:775
-#: ../calendar/gui/dialogs/task-page.c:953
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Se requiere un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/task-page.c:977
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Es necesario por lo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:1965
-#: ../calendar/gui/dialogs/task-page.c:1262
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Añadir"
 
-#: ../calendar/gui/dialogs/event-page.c:2708
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "No es posible abrir el calendario «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2752
-#: ../calendar/gui/dialogs/memo-page.c:985
-#: ../calendar/gui/dialogs/task-page.c:1923
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Está actuando en nombre de <b>%s</b>"
 
-#: ../calendar/gui/dialogs/event-page.c:3050
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d día antes de la cita"
 msgstr[1] "%d días antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3056
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora antes de la cita"
 msgstr[1] "%d horas antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3062
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes de la cita"
 msgstr[1] "%d minutos antes de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3075
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "Personalizar"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3080
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:943
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
 #: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
 #: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2020
+#: ../plugins/itip-formatter/itip-formatter.c:2022
 #: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
 #: ../widgets/misc/e-dateedit.c:1731
 #: ../widgets/misc/e-signature-combo-box.c:69
@@ -6578,17 +6793,17 @@ msgstr "_Contactos…"
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Nota"
 
-#: ../calendar/gui/dialogs/memo-page.c:947
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "No es posible abrir las notas en «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1131 ../mail/em-format-html.c:1562
-#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1561
+#: ../mail/em-format-html.c:1619 ../mail/em-format-html.c:1645
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
@@ -6608,7 +6823,7 @@ msgid "_Description:"
 msgstr "_Descripción:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
@@ -6649,17 +6864,17 @@ msgstr "Esta instancia y las futuras"
 msgid "All Instances"
 msgstr "Todas las instancias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:495
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita tiene repeticiones que Evolution no puede editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:816
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "La fecha de repetición es inválida"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "en"
 
@@ -6667,7 +6882,7 @@ msgstr "en"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "primer"
 
@@ -6676,7 +6891,7 @@ msgstr "primer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:999
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "segundo"
 
@@ -6684,7 +6899,7 @@ msgstr "segundo"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1004
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "tercer"
 
@@ -6692,7 +6907,7 @@ msgstr "tercer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "cuarto"
 
@@ -6700,13 +6915,13 @@ msgstr "cuarto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "último"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Otra fecha"
 
@@ -6714,7 +6929,7 @@ msgstr "Otra fecha"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "del 1 al 10"
 
@@ -6722,7 +6937,7 @@ msgstr "del 1 al 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1054
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "del 11 al 20"
 
@@ -6730,45 +6945,45 @@ msgstr "del 11 al 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "del 21 al 31"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "día"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "en el"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "repeticiones"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Añadir excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "No es posible obtener una selección que modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Modificar excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "No es posible obtener una selección que borrar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Fecha/Hora"
 
@@ -6819,12 +7034,12 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "año(s)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:409
-#: ../calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "La fecha de terminación es errónea"
 
-#: ../calendar/gui/dialogs/task-details-page.c:514
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "Página web"
 
@@ -6842,18 +7057,18 @@ msgstr "<span weight=\"bold\">Estado</span>"
 #: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
 #: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2520 ../calendar/gui/tasktypes.xml.h:13
+#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "Terminado"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:360 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Alta"
 
@@ -6862,22 +7077,22 @@ msgstr "Alta"
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "En proceso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:362 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1061
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Baja"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1062
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normal"
 
@@ -6885,8 +7100,8 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
 #: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Sin comenzar"
@@ -6900,7 +7115,7 @@ msgid "Stat_us:"
 msgstr "_Estado:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Sin definir"
 
@@ -6917,25 +7132,37 @@ msgstr "_Prioridad:"
 msgid "_Web Page:"
 msgstr "Página _web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "Detalles de _estado"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+msgid "Click to change or view the status details of the task"
+msgstr "Pulse para cambiar o ver los detalles del estado de la tarea"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "Opciones de _envío"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_Tarea"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Detalles"
 
-#: ../calendar/gui/dialogs/task-page.c:454
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "La fecha de vencimiento es errónea"
 
-#: ../calendar/gui/dialogs/task-page.c:1880
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "No es posible abrir las tareas en «%s»."
@@ -7037,14 +7264,13 @@ msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3329
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:856
-#: ../shell/e-shell-folder-title-bar.c:586
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
 msgid "Untitled"
 msgstr "Sin título"
 
@@ -7082,7 +7308,7 @@ msgstr "Fecha de vencimiento:"
 #: ../calendar/gui/e-cal-component-preview.c:246
 #: ../calendar/gui/e-itip-control.c:1186
 #: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:1027
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Estado:"
 
@@ -7100,12 +7326,12 @@ msgid "Start Date"
 msgstr "Fecha de inicio"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:620
 #: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Ocupada"
@@ -7142,12 +7368,12 @@ msgstr "No"
 #: ../calendar/gui/e-meeting-list-view.c:167
 #: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2045
+#: ../plugins/itip-formatter/itip-formatter.c:2047
 #: ../plugins/plugin-manager/plugin-manager.c:73
-#: ../widgets/misc/e-attachment-bar.c:852
+#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "Desconocido"
@@ -7164,7 +7390,7 @@ msgstr "Asignado"
 msgid "Save As..."
 msgstr "Guardar como…"
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2030
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2028
 msgid "Select folder to save selected attachments..."
 msgstr "Seleccione la carpeta donde guardar los adjuntos seleccionados…"
 
@@ -7173,9 +7399,9 @@ msgstr "Seleccione la carpeta donde guardar los adjuntos seleccionados…"
 msgid "untitled_image.%s"
 msgstr "imagen-_sin-título.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1367
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
 #: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "Guardar _como…"
 
@@ -7193,126 +7419,152 @@ msgstr "_Guardar seleccionados"
 msgid "Open in %s..."
 msgstr "Abrir en %s…"
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* Sin resumen *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organizador: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:377
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organizador: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "Empieza: "
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "Vence: "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
+#: ../calendar/gui/e-calendar-table.c:879
 #: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
-#: ../calendar/gui/e-calendar-table.c:954
+#: ../calendar/gui/e-calendar-table.c:1163
 #: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: ../calendar/gui/e-calendar-table.c:1139
+#: ../calendar/gui/e-calendar-table.c:1348
 #: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
 #: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "Guardar como…"
 
-#: ../calendar/gui/e-calendar-table.c:1362
+#: ../calendar/gui/e-calendar-table.c:1571
 #: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "_Tarea nueva"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Abrir página _web"
 
-#: ../calendar/gui/e-calendar-table.c:1368
+#: ../calendar/gui/e-calendar-table.c:1577
 #: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "_Imprimir…"
 
-#: ../calendar/gui/e-calendar-table.c:1372
+#: ../calendar/gui/e-calendar-table.c:1581
 #: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: ../calendar/gui/e-calendar-table.c:1374
+#: ../calendar/gui/e-calendar-table.c:1583
 #: ../calendar/gui/e-calendar-view.c:1669
 #: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Asignar tarea"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Reenviar como iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminado"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tareas seleccionadas como terminadas"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "_Marcar como incompleto"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marcar tareas seleccionadas como incompletas"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Pulse para añadir una tarea"
@@ -7405,7 +7657,7 @@ msgstr "Reenviar como i_Calendar…"
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1336
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
 #: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
@@ -7423,26 +7675,14 @@ msgstr "Borrar esta _repetición"
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las repeticiones"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2227
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organizador: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2231
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organizador: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2247 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2281
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -7482,19 +7722,19 @@ msgstr "divisiones de %02i minutos"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1672
 msgid "%A %d %B"
 msgstr "%A %e de %B"
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
 
@@ -7612,12 +7852,12 @@ msgstr ""
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2033
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "Aceptado"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2036
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
@@ -7625,7 +7865,7 @@ msgstr "Aceptado provisionalmente"
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
 #: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2039
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "Rehusado"
 
@@ -7944,49 +8184,49 @@ msgstr "Participantes"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
 #: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:967
+#: ../calendar/gui/print.c:983
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:968
+#: ../calendar/gui/print.c:984
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/print.c:998
 msgid "Chair"
 msgstr "Presidente"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
 #: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
 msgid "Required Participant"
 msgstr "Participante requerido"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/print.c:1000
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "No participan"
 
@@ -8005,7 +8245,7 @@ msgstr "Provisional"
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
 #: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2042
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -8189,7 +8429,7 @@ msgstr "Seleccione la zona horaria"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%e de %B"
 
@@ -8385,6 +8625,7 @@ msgid "New memo"
 msgstr "Nota nueva"
 
 #: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
 msgstr "_Nota"
 
@@ -8397,6 +8638,7 @@ msgid "New shared memo"
 msgstr "Nota nueva compartida"
 
 #: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "Nota _compartida"
 
@@ -8409,6 +8651,7 @@ msgid "New memo list"
 msgstr "Lista de notas nueva"
 
 #: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "_Lista de notas"
 
@@ -8421,7 +8664,7 @@ msgid "Print Memos"
 msgstr "Imprimir notas"
 
 #: ../calendar/gui/memotypes.xml.h:25
-msgid "Next 7 Days'"
+msgid "Next 7 Days"
 msgstr "Próximos 7 días"
 
 #: ../calendar/gui/migration.c:157
@@ -8626,60 +8869,60 @@ msgstr "Vi"
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Tarea"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumen: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridad: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaje completado: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Contactos: "
 
 #. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:2762
 msgid "Upcoming Appointments"
 msgstr "Eventos próximos"
 
 #: ../calendar/gui/tasks-component.c:456
 msgid "_New Task List"
-msgstr "_Lista de tareas nueva"
+msgstr "Lista de tareas _nueva"
 
 #: ../calendar/gui/tasks-component.c:536
 #, c-format
@@ -8711,6 +8954,11 @@ msgstr "Selector de origen de tareas"
 msgid "New task"
 msgstr "Tarea nueva"
 
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "_Tarea"
+
 #: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Crea una tarea nueva"
@@ -8720,6 +8968,7 @@ msgid "New assigned task"
 msgstr "Nueva tarea asignada"
 
 #: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarea _asignada"
 
@@ -8732,8 +8981,9 @@ msgid "New task list"
 msgstr "Lista de tareas nueva"
 
 #: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
-msgstr "_Lista de tareas"
+msgstr "Lista de ta_reas"
 
 #: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
@@ -8751,7 +9001,7 @@ msgstr ""
 "\n"
 "¿Borrar realmente esas tareas?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
@@ -10368,16 +10618,12 @@ msgstr "_Adjuntar"
 msgid "Untitled Message"
 msgstr "Mensaje sin título"
 
-#: ../composer/e-composer-actions.c:472 ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "_Adjunto…"
-
 #: ../composer/e-composer-actions.c:474
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
 
 #: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Cerrar"
 
@@ -10385,7 +10631,7 @@ msgstr "_Cerrar"
 msgid "Close the current file"
 msgstr "Cierra el archivo actual"
 
-#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1343
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
@@ -10426,10 +10672,6 @@ msgstr "_Enviar"
 msgid "Send this message"
 msgstr "Enviar este mensaje"
 
-#: ../composer/e-composer-actions.c:528 ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "Opciones de _envío"
-
 #: ../composer/e-composer-actions.c:530
 msgid "Insert Send options"
 msgstr "Insertar opciones de envío"
@@ -10554,10 +10796,6 @@ msgstr "Campo «_Para»"
 msgid "Toggles whether the To field is displayed"
 msgstr "Conmutador que indica si se muestra el campo «Para»"
 
-#: ../composer/e-composer-actions.c:700 ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "Adjuntar"
-
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
@@ -10644,8 +10882,8 @@ msgstr ""
 "No es posible cifrar el mensaje saliente: no hay establecido un certificado "
 "de cifrado para esta cuenta"
 
-#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1914
-#: ../mail/em-format-html-display.c:2404 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1912
+#: ../mail/em-format-html-display.c:2402 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -10803,23 +11041,27 @@ msgstr "No puede adjuntar el archivo «{0}» a este mensaje."
 msgid "You need to configure an account before you can compose mail."
 msgstr "Necesita configurar una cuenta antes de poder escribir correo."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Continuar editando"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_No recuperar"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
 msgid "_Recover"
 msgstr "_Recuperar"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Guardar mensaje"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "Guardar _borrador"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Correo y calendario de Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Suite de trabajo en grupo"
 
@@ -11101,56 +11343,56 @@ msgstr "Elija un archivo"
 msgid "Test"
 msgstr "Prueba"
 
-#: ../filter/filter-rule.c:851
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "Nombre de la _regla:"
 
-#: ../filter/filter-rule.c:879
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Buscar elementos que cumplen con estos criterios"
 
-#: ../filter/filter-rule.c:913
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "_Añadir regla de filtrado"
 
-#: ../filter/filter-rule.c:919
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "Si se cumplen todos los criterios"
 
-#: ../filter/filter-rule.c:919
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "Si se cumple algún criterio"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Buscar elementos:"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Todas las relacionadas"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Respuestas"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Respuestas y antecesores"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Sin respuesta o antecesor"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "I_ncluir conversaciones"
 
-#: ../filter/filter-rule.c:1043 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/filter-rule.c:1043 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Saliente"
 
@@ -11264,7 +11506,7 @@ msgstr "la fecha que especifique"
 
 #: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:399
+#: ../plugins/google-account-setup/google-source.c:718
 msgid "weeks"
 msgstr "semanas"
 
@@ -11334,10 +11576,10 @@ msgstr "Control de preferencias de Evolution"
 msgid "Evolution Network configuration control"
 msgstr "Control de configuración de red de Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:611
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
-#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
-#: ../mail/mail-component.c:757
+#: ../mail/mail-component.c:595 ../mail/mail-component.c:596
+#: ../mail/mail-component.c:760
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Correo"
@@ -11396,46 +11638,46 @@ msgstr "Preguntar por cada mensaje"
 msgid "Identity"
 msgstr "Identidad"
 
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Recepción de correo"
 
-#: ../mail/em-account-editor.c:2041
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "Comprobar si hay correo _nuevo cada"
 
-#: ../mail/em-account-editor.c:2049
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Envío de correo"
 
-#: ../mail/em-account-editor.c:2282 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Predeterminados"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:130
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
 #: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Seguridad"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2385 ../mail/em-account-editor.c:2476
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "Opciones de recepción"
 
-#: ../mail/em-account-editor.c:2386 ../mail/em-account-editor.c:2477
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "Comprobando si hay mensajes nuevos"
 
-#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor de cuentas"
 
-#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
@@ -11469,18 +11711,18 @@ msgstr "Añadir un script de firma"
 msgid "Signature(s)"
 msgstr "Firma(s)"
 
-#: ../mail/em-composer-utils.c:1007 ../mail/em-format-quote.c:413
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "--------- Mensaje reenviado --------"
 
-#: ../mail/em-composer-utils.c:1819
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1866
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11488,7 +11730,7 @@ msgstr ""
 "El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribió:"
 
-#: ../mail/em-composer-utils.c:2009
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-----Mensaje original-----"
 
@@ -11589,7 +11831,7 @@ msgstr "Expresión"
 msgid "Follow Up"
 msgstr "Seguimiento"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1053
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Importante"
 
@@ -11801,11 +12043,11 @@ msgstr "Mensajes importantes"
 msgid "Messages Not Junk"
 msgstr "Mensajes que no son SPAM"
 
-#: ../mail/em-folder-browser.c:1147
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "Búsqueda en la cuenta"
 
-#: ../mail/em-folder-browser.c:1200
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "Búsqueda en todas las cuentas"
 
@@ -11828,7 +12070,16 @@ msgstr[1] "Mensajes en total:"
 msgid "Quota usage"
 msgstr "Uso de cuota"
 
-#: ../mail/em-folder-properties.c:385
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
+#: ../mail/mail-component.c:583
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
+msgid "Inbox"
+msgstr "Bandeja de entrada"
+
+#: ../mail/em-folder-properties.c:386
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Propiedades de la carpeta"
@@ -11856,27 +12107,19 @@ msgstr "Carpetas de búsqueda"
 msgid "UNMATCHED"
 msgstr "NO COINCIDENTE"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Borradores"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2540
-#: ../mail/mail-component.c:160
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:592
-msgid "Inbox"
-msgstr "Bandeja de entrada"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Bandeja de salida"
 
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Correo enviado"
 
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Cargando…"
 
@@ -11895,85 +12138,79 @@ msgstr "Cargando…"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:371
+#: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Árbol de carpetas de correo"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moviendo la carpeta %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando la carpeta %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1954
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1956
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No es posible dejar el(los) mensaje(s) en el almacén de nivel superior"
 
-#: ../mail/em-folder-tree.c:994 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Copiar a la carpeta"
 
-#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Mover a la carpeta"
 
-#: ../mail/em-folder-tree.c:1709 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en «%s»"
 
-#: ../mail/em-folder-tree.c:2082 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Ver"
-
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Abrir en una ventana _nueva"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2088
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "Carpeta _nueva…"
 
-#: ../mail/em-folder-tree.c:2091
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Mover…"
 
-#: ../mail/em-folder-tree.c:2098 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Renombrar…"
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "A_ctualizar"
 
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "Enviar correos pe_ndientes"
 
-#: ../mail/em-folder-tree.c:2106 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
@@ -11982,13 +12219,13 @@ msgstr "_Vaciar papelera"
 msgid "Copying `%s' to `%s'"
 msgstr "Copiando «%s» a «%s»"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
 msgid "C_opy"
 msgstr "C_opiar"
 
@@ -12010,199 +12247,204 @@ msgstr "Crear carpeta"
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Ha fallado el borrado del correo"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "No tiene suficientes permisos para borrar este correo."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:569 ../mail/em-popup.c:580
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "Reen_viar"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo…"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1348
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1349
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta…"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1350
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta…"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1353
 msgid "Mar_k as Read"
 msgstr "Mar_car como leído"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Unread"
 msgstr "Marcar como _no leído"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as Un_important"
 msgstr "Marcar como no _importante"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Junk"
 msgstr "Marcar como _SPAM"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _no SPAM"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1359
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para se_guimiento…"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1361
 msgid "_Label"
 msgstr "_Etiqueta"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Ninguna"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1365
 msgid "_New Label"
 msgstr "Etiqueta _nueva"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1369
 msgid "Fla_g Completed"
 msgstr "Ma_rcar como terminado"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1370
 msgid "Cl_ear Flag"
 msgstr "_Quitar marca"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1373
 msgid "Crea_te Rule From Message"
 msgstr "Crear re_gla desde el mensaje"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1375
 msgid "Search Folder based on _Subject"
 msgstr "Carpeta de búsqueda según el a_sunto"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1376
 msgid "Search Folder based on Se_nder"
 msgstr "Carpeta de búsqueda según el re_mitente"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1377
 msgid "Search Folder based on _Recipients"
 msgstr "Carpeta de búsqueda según los des_tinatarios"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1378
 msgid "Search Folder based on Mailing _List"
 msgstr "Carpeta de búsqueda según la _lista de correo"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1383
 msgid "Filter based on Sub_ject"
 msgstr "Filtro según el _asunto"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1384
 msgid "Filter based on Sen_der"
 msgstr "Filtro según el _remitente"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1385
 msgid "Filter based on Re_cipients"
 msgstr "Filtro según los _destinatarios"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1386
 msgid "Filter based on _Mailing List"
 msgstr "Filtro según la lista de _correo"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2268 ../mail/em-folder-view.c:2312
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
+#: ../plugins/google-account-setup/google-source.c:301
+#: ../plugins/google-account-setup/google-source.c:586
+#: ../plugins/google-account-setup/google-source.c:772
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../mail/em-folder-view.c:2530
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "No se pudo obtener el mensaje"
 
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "Obteniendo mensaje…"
 
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "Ll_amar a…"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
 msgstr "Crear carpeta de _búsqueda"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "_Desde esta dirección"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "_A esta dirección"
 
-#: ../mail/em-folder-view.c:3310
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "Pulse para enviar correo a %s"
 
-#: ../mail/em-folder-view.c:3322
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "Pulse para llamar a %s"
 
-#: ../mail/em-folder-view.c:3327
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "Pulse para ocultar/mostrar las direcciones"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:472
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "Coincide con: %d"
 
-#: ../mail/em-format-html-display.c:616
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "_Buscar:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:640
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../mail/em-format-html-display.c:645
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "_Siguiente"
 
-#: ../mail/em-format-html-display.c:650
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "_Coincidir con capitalización"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:649
 msgid "Unsigned"
 msgstr "No firmado"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12210,11 +12452,11 @@ msgstr ""
 "Este mensaje no está firmado. No hay garantía de que el mensaje sea "
 "auténtico."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
 msgid "Valid signature"
 msgstr "Firma válida"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12222,11 +12464,11 @@ msgstr ""
 "Este mensaje está firmado y es válido, lo que significa que es muy probable "
 "que el mensaje sea auténtico."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
 msgid "Invalid signature"
 msgstr "Firma no válida"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12234,11 +12476,11 @@ msgstr ""
 "La firma de este mensaje no se puede verificar, pudo haber sido alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
 msgid "Valid signature, but cannot verify sender"
 msgstr "Firma válida, pero no se puede verificar el remitente"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12246,11 +12488,11 @@ msgstr ""
 "Este mensaje está firmado con una firma válida, pero el remitente del "
 "mensaje no se pudo verificar."
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
 msgid "Signature exists, but need public key"
 msgstr "La firma existe pero se necesita la clave pública"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12258,11 +12500,11 @@ msgstr ""
 "Este mensaje está firmado con una firma pero no existe una clave pública "
 "correspondiente."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:659
 msgid "Unencrypted"
 msgstr "Descifrado"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12270,11 +12512,11 @@ msgstr ""
 "Este mensaje no está cifrado. Su contenido puede verse en tránsito a través "
 "de Internet."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
 msgid "Encrypted, weak"
 msgstr "Cifrado, débil"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:959
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12284,11 +12526,11 @@ msgstr ""
 "ser difícil, pero no imposible para un espía ver el contenido de este "
 "mensaje empleando algo de tiempo."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12296,11 +12538,11 @@ msgstr ""
 "Este mensaje está cifrado. Sería difícil para un espía ver el contenido de "
 "este mensaje."
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
 msgid "Encrypted, strong"
 msgstr "Cifrado, fuerte"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:961
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12310,87 +12552,87 @@ msgstr ""
 "difícil que un espía vea el contenido de este mensaje en empleando un tiempo "
 "razonable."
 
-#: ../mail/em-format-html-display.c:1064 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:1079
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "Certificado no es visible"
 
-#: ../mail/em-format-html-display.c:1372
+#: ../mail/em-format-html-display.c:1370
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminado el %e de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1378
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1381
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "antes del %e de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1459
 msgid "_View Inline"
 msgstr "_Ver incluido"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1460
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1461
 msgid "_Fit to Width"
 msgstr "_Ajustar al ancho"
 
-#: ../mail/em-format-html-display.c:1464
+#: ../mail/em-format-html-display.c:1462
 msgid "Show _Original Size"
 msgstr "Mostrar tamaño _original"
 
-#: ../mail/em-format-html-display.c:1984
+#: ../mail/em-format-html-display.c:1982
 msgid "Save attachment as"
 msgstr "Guarda los adjuntos como"
 
-#: ../mail/em-format-html-display.c:1988
+#: ../mail/em-format-html-display.c:1986
 msgid "Select folder to save all attachments"
 msgstr "Seleccione la carpeta donde guardar todos los adjuntos"
 
-#: ../mail/em-format-html-display.c:2039
+#: ../mail/em-format-html-display.c:2037
 msgid "_Save Selected..."
 msgstr "_Guardar seleccionados…"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2106
+#: ../mail/em-format-html-display.c:2104
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d a_djunto"
 msgstr[1] "%d a_djuntos"
 
-#: ../mail/em-format-html-display.c:2113 ../mail/em-format-html-display.c:2202
+#: ../mail/em-format-html-display.c:2111 ../mail/em-format-html-display.c:2200
 msgid "S_ave"
 msgstr "_Guardar"
 
-#: ../mail/em-format-html-display.c:2124
+#: ../mail/em-format-html-display.c:2122
 msgid "S_ave All"
 msgstr "Guardar _todo"
 
-#: ../mail/em-format-html-display.c:2198
+#: ../mail/em-format-html-display.c:2196
 msgid "No Attachment"
 msgstr "Sin adjunto"
 
-#: ../mail/em-format-html-display.c:2339 ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2337 ../mail/em-format-html-display.c:2375
 msgid "View _Unformatted"
 msgstr "Ver _sin formato"
 
-#: ../mail/em-format-html-display.c:2341
+#: ../mail/em-format-html-display.c:2339
 msgid "Hide _Unformatted"
 msgstr "Ocultar _sin formato"
 
-#: ../mail/em-format-html-display.c:2396
+#: ../mail/em-format-html-display.c:2394
 msgid "O_pen With"
 msgstr "Abrir _con"
 
-#: ../mail/em-format-html-display.c:2467
+#: ../mail/em-format-html-display.c:2465
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12403,84 +12645,84 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
+#: ../mail/em-format-html.c:503 ../mail/em-format-html.c:512
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Obteniendo «%s»"
 
-#: ../mail/em-format-html.c:925
+#: ../mail/em-format-html.c:924
 msgid "Unknown external-body part."
 msgstr "Parte externa al cuerpo del mensaje desconocida."
 
-#: ../mail/em-format-html.c:933
+#: ../mail/em-format-html.c:932
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: ../mail/em-format-html.c:963
+#: ../mail/em-format-html.c:962
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:974
+#: ../mail/em-format-html.c:973
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) válido en el sitio «%s»"
 
-#: ../mail/em-format-html.c:976
+#: ../mail/em-format-html.c:975
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: ../mail/em-format-html.c:997
+#: ../mail/em-format-html.c:996
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a datos remotos (%s)"
 
-#: ../mail/em-format-html.c:1008
+#: ../mail/em-format-html.c:1007
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
 
-#: ../mail/em-format-html.c:1236
+#: ../mail/em-format-html.c:1235
 msgid "Formatting message"
 msgstr "Formateando el mensaje"
 
-#: ../mail/em-format-html.c:1410
+#: ../mail/em-format-html.c:1409
 msgid "Formatting Message..."
 msgstr "Formateando el mensaje…"
 
-#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../mail/em-format-html.c:1562 ../mail/em-format-html.c:1626
+#: ../mail/em-format-html.c:1648 ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
-#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1632
+#: ../mail/em-format-html.c:1651 ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Cco"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:350
+#: ../mail/em-format-html.c:1743 ../mail/em-format-quote.c:352
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Transporte"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1771
+#: ../mail/em-format-html.c:1770
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1776
+#: ../mail/em-format-html.c:1775
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1907
+#: ../mail/em-format-html.c:1906
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Este mensaje lo envió <b>%s</b> en nombre de <b>%s</b>"
@@ -12511,43 +12753,43 @@ msgstr "Grupos de noticias"
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: ../mail/em-format.c:1198
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "No es posible interpretar el mensaje S/MIME: Error desconocido"
 
-#: ../mail/em-format.c:1335 ../mail/em-format.c:1491
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No es posible analizar el mensaje MIME. Mostrando la fuente."
 
-#: ../mail/em-format.c:1343
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de cifrado no soportado para multipart/encrypted"
 
-#: ../mail/em-format.c:1353
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "No es posible interpretar el mensaje PGP/MIME"
 
-#: ../mail/em-format.c:1353
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "No es posible interpretar el mensaje PGP/MIME: Error desconocido"
 
-#: ../mail/em-format.c:1510
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "Formato de firma no soportado"
 
-#: ../mail/em-format.c:1518 ../mail/em-format.c:1589
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "Error al verificar la firma"
 
-#: ../mail/em-format.c:1518 ../mail/em-format.c:1580 ../mail/em-format.c:1589
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "Error desconocido al verificar la firma"
 
-#: ../mail/em-format.c:1661
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "No es posible interpretar el mensaje PGP"
 
-#: ../mail/em-format.c:1661
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "No es posible interpretar el mensaje PGP: Error desconocido"
 
@@ -12608,68 +12850,85 @@ msgid "No Junk plugin available"
 msgstr "No hay complemento para SPAM disponible"
 
 #. green
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Tareas pendientes"
 
 #. blue
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Más tarde"
 
-#: ../mail/em-migrate.c:1210
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"El lugar y jerarquía de las carpetas de buzones de correo ha cambiado desde "
-"Evolution 1.x.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus carpetas…"
+#: ../mail/em-migrate.c:1247
+#, c-format
+msgid "Migrating '%s':"
+msgstr "Migrando «%s»:"
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "No es posible crear la carpeta nueva: «%s»: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "No es posible copiar el la carpeta «%s» a «%s»: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "No es posible buscar buzones existentes en «%s»: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:1868
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"El lugar y jerarquía de las carpetas de buzones de correo ha cambiado desde "
+"Evolution 1.x.\n"
+"\n"
+"Tenga paciencia mientras Evolution migra sus carpetas…"
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "No es posible abrir los datos antiguos POP keep-on-server «%s»: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Fallo al crear directorio de datos POP3 keep-on-server «%s»: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "No es posible copiar los datos POP3 keep-on-server «%s»: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "No es posible crear el almacén de correo local «%s»: %s"
 
-#: ../mail/em-migrate.c:2851
+#: ../mail/em-migrate.c:2898
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"El formato de resúmenes de las carpetas del buzón de Evolution se ha movido "
+"a sqlite desde Evolution 2.24.\n"
+"\n"
+"Tenga paciencia mientras Evolution migra sus carpetas…"
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "No es posible crear las carpetas de correo local en: «%s»: %s"
 
-#: ../mail/em-migrate.c:2870
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12817,10 +13076,18 @@ msgstr ""
 "en address_count."
 
 #: ../mail/evolution-mail.schemas.in.h:17
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"Controla la frecuencia con la que los cambios locales se sincronizan con el "
+"servidor de correo-e remoto. El intervalo debe ser de al menos 30 segundos."
+
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
 msgstr "Cabeceras personalizadas que usar al comprobar si es SPAM."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -12828,59 +13095,59 @@ msgstr ""
 "Cabeceras personalizadas que usar para comprobar si es SPAM. La lista de "
 "elementos son cadenas con el formato \"headername=valor\"."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Conjunto de caracteres predeterminado para redactar mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Conjunto de caracteres predeterminado para redactar mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Estilo de reenvío predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Altura predeterminada de la ventana del editor de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Altura predeterminada de la ventana del mensaje."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Altura predeterminada del diálogo de suscripción."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Estilo de respuesta predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Valor predeterminado para el estado de expansión de la conversación"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Anchura predeterminada de la ventana del editor de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Anchura predeterminada de la ventana de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Anchura predeterminada del diálogo de suscripción."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
 "Determines whether to look up addresses for junk filtering in local "
 "addressbook only"
@@ -12888,13 +13155,13 @@ msgstr ""
 "Determina si se deben buscar direcciones para filtrar SPAM sólo en la "
 "libreta de direcciones local"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr ""
 "Determina si se debe buscar la dirección del remitente en la libreta de "
 "direcciones"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12906,11 +13173,11 @@ msgstr ""
 "libretas marcadas para autocompletado. Puede ser lento si se han marcado "
 "para autocompletado libretas de direcciones remotas (como LDAP)."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Determina si se deben usar cabeceras personalizadas para comprobar si es SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12920,7 +13187,7 @@ msgstr ""
 "SPAM. Si esta opción está activada y las cabeceras se mencionan, se mejorará "
 "la velocidad de comprobado de correo basura."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -12928,63 +13195,63 @@ msgstr ""
 "Determina si se debe usar la misma tipografía para las líneas «De» y «Asunto» "
 "en la columna «Mensajes» de la vista vertical."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directorio para cargar/adjuntar archivos en el editor."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Directorio para guardar archivos enviados por correo."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
 msgstr ""
 "Desactivar o activar la elipsis de los nombres de las carpetas en el árbol "
 "de carpetas"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Dibujar indicadores de errores tipográficos en las palabras mientras se "
 "escribe."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Vaciar las carpetas SPAM al salir"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Vaciar papeleras al salir"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Vaciar todas las carpetas SPAM al salir de Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vaciar todas las papeleras al salir de Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Habilitar modo cursor, para que pueda ver un cursor cuando lee correo."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Activa o desactiva la barra espaciadora mágica"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Activa o desactiva la característica de búsqueda al teclear"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Activar las carpetas de búsqueda"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Activar las carpetas de búsqueda al inicio."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12996,7 +13263,7 @@ msgstr ""
 "fácilmente una carpeta en esa barra lateral tan sólo tecleando el nombre de "
 "la carpeta y la selección salta automáticamente a esa carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -13004,27 +13271,27 @@ msgstr ""
 "Activar esto para usar la barra espaciadora para desplazarse en la vista "
 "previa del mensaje, lista de mensajes y carpetas."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "Activar para mostrar la parte de texto del mensaje de tamaño limitado."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar modo cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Altura del panel de lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Altura del panel de vista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta la vista previa por carpeta y elimina la selección"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -13032,7 +13299,7 @@ msgstr ""
 "Si el usuario intenta abrir diez o más mensajes al mismo tiempo, preguntar "
 "al usuario si quiere realmente hacerlo."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -13040,7 +13307,7 @@ msgstr ""
 "Si el panel de «Vista previa» está activado, entonces lo muestra en el "
 "lateral en vez de verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -13051,7 +13318,7 @@ msgstr ""
 "visor de componentes bonobo en la base de datos de GNOME puede usarse para "
 "mostrar el contenido."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -13059,7 +13326,7 @@ msgstr ""
 "Altura inicial de la ventana «Enviar y recibir correo». El valor se actualiza "
 "según el usuario redimensiona verticalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13073,7 +13340,7 @@ msgstr ""
 "no se puede maximizar. Esta clave existe sólo como un detalle de "
 "implementación."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -13081,11 +13348,11 @@ msgstr ""
 "Anchura inicial de la ventana «Enviar y recibir correo». El valor se "
 "actualiza según el usuario redimensiona horizontalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "Desactiva/activa la pregunta cuando se marcan varios mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -13093,7 +13360,7 @@ msgstr ""
 "Habilita/deshabilita la característica donde la pregunta de si se requiere "
 "sincronización antes de pasar al modo trabajar desconectado se repite."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -13103,31 +13370,31 @@ msgstr ""
 "mensajes de una carpeta de búsqueda borra permanentemente el mensaje, no "
 "sólo los elimina de los resultados de la búsqueda."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "Última vez que se vació el SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "Última vez que se vació la papelera"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Nivel más allá del cuál el mensaje se debe registrar."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas y sus colores asociados"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Lista de licencias aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Lista de cuentas"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13136,15 +13403,15 @@ msgstr ""
 "lista contiene cadenas nombrando subdirectorios relativos a /apps/evolution/"
 "mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceras personalizadas y si están activadas."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Lista de los códigos de diccionario usados para la corrección ortográfica."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13153,200 +13420,204 @@ msgstr ""
 "lista contiene cadenas con el nombre:color donde color usa la codificación "
 "hex HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Lista de tipos mime de comprobación de visores de componentes bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nombres de protocolos cuya licencia ha sido aceptada."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Cargar imágenes para mensajes HTML sobre http"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net. 1 - Load images in messages from contacts. 2 - "
-"Always load images off the net."
+"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
 msgstr ""
 "Cargar imágenes de los mensajes HTML sobre http(s). Los valores posibles "
-"son: 0: Nunca cargar imágenes desde la red; 1: Cargar imágenes si el "
-"remitente está en la libreta de direcciones; 2: Siempre cargar imágenes "
+"son: «0»: Nunca cargar imágenes desde la red; «1»: Cargar imágenes si el "
+"remitente está en la libreta de direcciones; «2»: Siempre cargar imágenes "
 "desde la red."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Registrar acciones de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Registrar acciones de filtrado en el archivo de registro especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Archivo de registro para registrar las acciones de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Archivo de registro para registrar las acciones de filtrado."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto después del tiempo especificado"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto después del tiempo especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citas textuales en la vista previa del mensaje"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citas textuales en la «vista previa» del mensaje."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Altura predeterminada de la ventana de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Anchura predeterminada de la ventana de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de visualización del mensaje (\"normal\", \"full headers\" (cabeceras "
 "completas), \"source\" (fuente))"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Días mínimos entre el vaciado del SPAM a la salida"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Días mínimos entre el vaciado de la papelera a la salida"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Tiempo mínimo entre el vaciado del SPAM a la salida, en días."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tiempo mínimo entre el vaciado de la papelera a la salida, en días."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Número de direcciones a mostrar en PARA/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Preguntar si el asunto está en blanco"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar al usuario cuando intente compactar una carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar al usuario cuando intente enviar un mensaje sin un asunto."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Preguntar para comprobar si el usuario quiere desconectarse inmediatamente"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "Preguntar al borrar mensajes en carpetas de búsqueda"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Preguntar cuando el usuario compacte"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cuando el usuario sólo rellene el campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Preguntar cuando el usuario intente abrir diez o más mensajes a la vez"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Preguntar al enviar mensajes en HTML a contactos quizá no los quieran."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Preguntar cuando el usuario intente enviar un mensaje sin destinatarios Para "
 "o Cc."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cuando el usuario intente enviar HTML no deseado"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Preguntar cuando se marquen varios mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Reconocer emoticonos en el texto y reemplazarlos con imágenes."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Reconocer enlaces en el texto y reemplazarlos."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Ejecutar la prueba de SPAM en el correo entrante."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Directorio donde guardar"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Search for the sender photo in local addressbooks"
 msgstr "Buscar la foto del remitente en libretas de direcciones locales"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML por omisión"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Envía el correo en HTML por omisión."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "Columna del correo-e del remitente en la lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "Intervalo de sincronización con el servidor"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Mostrar animaciones"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Muestra las imágenes animadas como animaciones."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Muestra los mensajes borrados (tachados) en la lista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Muestra los mensajes borrados en la lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Mostrar la foto del remitente"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -13354,67 +13625,67 @@ msgstr ""
 "Muestra el correo-e del remitente en una columna separada en la lista de "
 "mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Muestra la foto del remitente en el panel de lectura de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Comprobación ortográfica en línea"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Spell checking color"
 msgstr "Color de la corrección ortográfica"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell checking languages"
 msgstr "Comprobación ortográfica de idiomas"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Altura predeterminada del diálogo de suscripción"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Anchura predeterminada del diálogo de suscripción"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Tipografía del terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Límite de la parte de texto del mensaje"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "El complemento predeterminado para SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "La última vez que se vació el SPAM, en días desde la época."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "La última vez que se vació la papelera, en días desde la época."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "La tipografía de terminal para mostrar el correo."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "La tipografía de anchura variable para mostrar el correo."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
-"Esto puede tener tres valores posibles. 0 para errores. 1 para avisos. 2 "
+"Esto puede tener tres valores posibles. «0» para errores. «1» para avisos. «2» "
 "para mensajes de depuración."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -13423,7 +13694,7 @@ msgstr ""
 "bajo Evolution. Lo predeterminado son 4 Mib/4096 KiB y está especificado en "
 "términos de KiB."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13433,16 +13704,16 @@ msgstr ""
 "varios complementos activados. Si el complemento predeterminado listado está "
 "desactivado, entonces no usará los otros complementos disponibles."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid ""
-"This key is read only once and reset to false after read. This unselects the "
-"mail in the list and removes the preview for that folder."
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
 msgstr ""
 "Esta clave es de una sola lectura y después de leerla se establece a «false». "
 "Esto deselecciona el correo en la lista y elimina la vista previa para esa "
 "carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13454,7 +13725,7 @@ msgstr ""
 "estructura XML es &lt;header enabled&gt;: poner a activado si la cabecera se "
 "debe mostrar en la vista de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local addressbook only to exclude "
@@ -13465,11 +13736,11 @@ msgstr ""
 "local para excluir de los filtros de correo basura el correo enviado por "
 "contactos conocidos."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "Esta opción ayudará a mejorar la velocidad de obtención."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13477,7 +13748,7 @@ msgstr ""
 "Esto establece el número de direcciones a mostrar en la vista de lista de "
 "mensajes predeterminada, más allá de los cuales se muestra un «…»."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13486,7 +13757,7 @@ msgstr ""
 "deberían estar en estado expandido o contraído. Evolution necesita "
 "reiniciarse."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13496,33 +13767,18 @@ msgstr ""
 "último mensaje de cada conversación, en lugar de por la fecha del mensaje. "
 "Evolution necesita un reinicio."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Agrupar la lista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Agrupar la lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Agrupar la lista de mensajes en conversaciones basadas en el asunto"
 
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "Time interval, in seconds, how often upload store changes to server."
-msgstr ""
-"Intervalo de tiempo, en segundos, para la frecuencia con la que subir los "
-"cambios de almacenamiento al servidor."
-
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid ""
-"Time interval, in seconds, how often upload store changes to server. The "
-"actual value cannot be less than 30 seconds."
-msgstr ""
-"Intervalo de tiempo, en segundos, para la frecuencia con la que subir los "
-"cambios de almacenamiento al servidor. El valor actual no puede ser inferior "
-"a 30 segundos."
-
 #: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Tiempo para marcar un mensaje como visto"
@@ -13725,142 +13981,150 @@ msgstr "Lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "Añadir regla de filtrado"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Plantillas"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionado, "
 msgstr[1] "%d seleccionados, "
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d borrado"
 msgstr[1] "%d borrados"
 
-#: ../mail/mail-component.c:558
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d SPAM"
 msgstr[1] "%d SPAM"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviados"
 
-#: ../mail/mail-component.c:565
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d sin enviar"
 msgstr[1] "%d sin enviar"
 
-#: ../mail/mail-component.c:571
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d no leído, "
 msgstr[1] "%d no leídos, "
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:916
 msgid "New Mail Message"
 msgstr "Mensaje de correo nuevo"
 
-#: ../mail/mail-component.c:914
+#: ../mail/mail-component.c:917
+msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:918
 msgid "Compose a new mail message"
 msgstr "Redacta un mensaje de correo nuevo"
 
-#: ../mail/mail-component.c:921
+#: ../mail/mail-component.c:924
 msgid "New Mail Folder"
 msgstr "Carpeta de correo nueva"
 
-#: ../mail/mail-component.c:922
+#: ../mail/mail-component.c:925
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Carpeta de correo"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:926
 msgid "Create a new mail folder"
 msgstr "Crea una carpeta de correo nueva"
 
-#: ../mail/mail-component.c:1070
+#: ../mail/mail-component.c:1073
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Falló al actualizar la configuración de correo o carpetas."
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1586
 msgid "Error"
 msgstr "Error"
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1586
 msgid "Errors"
 msgstr "Errores"
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1587
 msgid "Warnings and Errors"
 msgstr "Avisos y errores"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1588
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1588
 msgid "Error, Warnings and Debug messages"
 msgstr "Mensajes de error, avisos y depuración"
 
-#: ../mail/mail-component.c:1712
+#: ../mail/mail-component.c:1715
 msgid "Debug Logs"
 msgstr "Depuración de sucesos"
 
-#: ../mail/mail-component.c:1726
+#: ../mail/mail-component.c:1729
 msgid "Show _errors in the status bar for"
 msgstr "Mostrar _errores en la barra de estado para"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1742
+#: ../mail/mail-component.c:1745
 msgid "second(s)."
 msgstr "segundo(s)."
 
-#: ../mail/mail-component.c:1748
+#: ../mail/mail-component.c:1751
 msgid "Log Messages:"
 msgstr "Mensajes de sucesos:"
 
-#: ../mail/mail-component.c:1789
+#: ../mail/mail-component.c:1792
 msgid "Log Level"
 msgstr "Nivel de sucesos"
 
-#: ../mail/mail-component.c:1798 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Hora"
 
-#: ../mail/mail-component.c:1808 ../mail/message-list.c:2429
+#: ../mail/mail-component.c:1811 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensajes"
 
-#: ../mail/mail-component.c:1817 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Cierra esta ventana"
@@ -14111,10 +14375,8 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Firmar digitalmente los mensajes s_alientes (por omisión)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr ""
-"No formatear contenidos de texto en los correos si el _tamaño del texto "
-"excede"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "No formatear mensajes si el ta_maño del texto excede"
 
 #: ../mail/mail-config.glade.h:72
 msgid "Do not mar_k messages as junk if sender is in my addressbook"
@@ -14252,18 +14514,24 @@ msgid ""
 msgstr "Nota: No se le pedirá una contraseña hasta que conecte por primera vez"
 
 #: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+"Esta opción se omitirá si se encuentra alguna coincidencia para una cabecera "
+"de SPAM personalizada."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de c_lave GPG/PGP:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "_Contraseña:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -14271,7 +14539,7 @@ msgstr ""
 "Introduzca un nombre descriptivo para esta cuenta en el espacio de abajo.\n"
 "Este nombre se usará sólo para mostrarlo."
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14280,7 +14548,7 @@ msgstr ""
 "no está seguro, pregúntele a su administrador de sistemas o a su Proveedor "
 "de Servicios de Internet."
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14290,115 +14558,115 @@ msgstr ""
 "«opcionales» no hace falta que los rellene, a menos que quiera incluir esta "
 "información en el correo-e que envíe."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Por favor seleccione entre las siguientes opciones"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
 msgstr "Puerto:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Preguntar al enviar mensajes que tan sólo tengan definido el _Cco"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Citado"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "_Recordar contraseña"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Recordar _contraseña"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
 msgstr "Equipo S_OCKS:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "Bu_scar la foto del remitente sólo en libretas de direcciones locales"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "S_eleccionar…"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "_Enviar confirmaciones de mensajes:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "Tipografía _estándar:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Selecciona letra de anchura fija para HTML"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecciona letra de anchura fija en HTML para imprimir"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Selecciona letra de anchura variable en HTML"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Selecciona letra de anchura variable en HTML para imprimir"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Envío de correo"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requiere autenticación"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_Tipo de servidor: "
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Certificado de _firma:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "_Firma:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Firmas"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Tabla de firmas"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Ortografía"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
 msgid "Start _typing at the bottom on replying"
 msgstr "Comenzar a _escribir en la parte final al responder"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "_Tipo: "
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14406,7 +14674,7 @@ msgstr ""
 "La lista de idiomas de aquí refleja únicamente los idiomas para los cuáles "
 "hay instalado un diccionario."
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14416,12 +14684,6 @@ msgstr ""
 "firma. El nombre que especifique se usará\n"
 "únicamente para mostrarlo por pantalla. "
 
-#: ../mail/mail-config.glade.h:151
-msgid "This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"Esta opción se omitirá si se encuentra alguna coincidencia para una cabecera "
-"de SPAM personalizada."
-
 #: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -14439,7 +14701,8 @@ msgid "Use Authe_ntication"
 msgstr "Usar aute_nticación"
 
 #: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:359
+#: ../plugins/google-account-setup/google-source.c:678
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "_Usuario:"
 
@@ -14518,7 +14781,7 @@ msgid "_Path:"
 msgstr "R_uta:"
 
 #: ../mail/mail-config.glade.h:178
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Preguntar al enviar mensajes en HTML a contactos que no los quieren"
 
 #: ../mail/mail-config.glade.h:179
@@ -14615,43 +14878,43 @@ msgstr "_Discriminar según capitalización"
 msgid "Co_mpleted"
 msgstr "_Terminado"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "_Buscar:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Buscar en el mensaje"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
 msgid "Flag to Follow Up"
 msgstr "Marcar para seguimiento"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Suscripciones de carpetas"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Acuerdo de licencia"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Ninguno seleccionado"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "S_ervidor:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Información de seguridad"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Carpetas específicas"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14659,19 +14922,19 @@ msgstr ""
 "Los mensajes que ha seleccionado para seguir se listan abajo.\n"
 "Por favor, seleccione una acción de seguimiento desde el menú «Marcar»."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Aceptar licencia"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Vence el:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Marca:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "_Marque esto para aceptar el acuerdo de licencia"
 
@@ -14815,7 +15078,7 @@ msgstr[1] "Descargando %d mensajes"
 #: ../mail/mail-ops.c:1978
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Guardando %d mensaje"
 msgstr[1] "Guardando %d mensajes"
 
@@ -14917,11 +15180,6 @@ msgstr "El usuario canceló la operación."
 msgid "_Save and Close"
 msgstr "_Guardar y cerrar"
 
-#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Archivo"
-
 #: ../mail/mail-signature-editor.c:355
 msgid "Edit Signature"
 msgstr "Editar firma"
@@ -15589,78 +15847,79 @@ msgstr "C_ompactar"
 msgid "_Open Messages"
 msgstr "_Abrir mensajes"
 
-#: ../mail/message-list.c:1050
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Visto"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Contestado"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Reenviado"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: ../mail/message-list.c:1059
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "La más baja"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Más baja"
 
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Más alta"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "La más alta"
 
-#: ../mail/message-list.c:1594 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1601 ../plugins/itip-formatter/itip-view.c:204
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: ../mail/message-list.c:1610 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: ../mail/message-list.c:1622 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %e %l:%M %p"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%e %b %Y"
 
-#: ../mail/message-list.c:3884
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3888 ../mail/message-list.c:4324
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
-#: ../mail/message-list.c:4170
+#: ../mail/message-list.c:4179
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15668,7 +15927,7 @@ msgstr ""
 "Ningún mensaje satisface su criterio de búsqueda. Limpie el criterio de "
 "selección con el elemento del menú Buscar->Limpiar o cámbielo."
 
-#: ../mail/message-list.c:4172
+#: ../mail/message-list.c:4181
 msgid "There are no messages in this folder."
 msgstr "No hay mensajes en esta carpeta."
 
@@ -15786,6 +16045,7 @@ msgstr ""
 "el cuerpo de un mensaje."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Palabras clave"
 
@@ -16021,8 +16281,8 @@ msgid "Please select a valid backup file to restore."
 msgstr "Seleccione un archivo de respaldo válido para restaurar."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "The selected folder does not have enough permissions to create the file"
-msgstr "La carpeta seleccionada no tiene suficientes permisos para crear el archivo"
+msgid "The selected folder is not writable."
+msgstr "No se puede escribir en la carpeta seleccionada."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
@@ -16057,10 +16317,10 @@ msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:565
-msgid "_Automatically create entries in the addressbook when responding to messages"
+msgid "_Auto-create addressbook entries when replying to messages"
 msgstr ""
-"Crear entradas _automáticamente en la libreta de direcciones cuando se "
-"responda al correo"
+"Crear entradas _automáticamente en la libreta de direcciones al responder "
+"correos"
 
 #: ../plugins/bbdb/bbdb.c:571
 msgid "Select Address book for Automatic Contacts"
@@ -16072,12 +16332,10 @@ msgstr "Contactos de mensajería instantánea"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
-"Sincronizar periódicamente la información de contacto y las imágenes desde "
-"la lista de amigos de Pidgin"
+"Sincronizar información e imágenes de contactos desde la lista de contactos "
+"de Pidgin"
 
 #: ../plugins/bbdb/bbdb.c:607
 msgid "Select Address book for Pidgin buddy list"
@@ -16161,7 +16419,7 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:352
+#: ../plugins/google-account-setup/google-source.c:671
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
@@ -16183,7 +16441,7 @@ msgstr "Proporciona funcionalidad básica para calendarios locales."
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:376
+#: ../plugins/google-account-setup/google-source.c:695
 msgid "Re_fresh:"
 msgstr "A_ctualizar:"
 
@@ -16323,10 +16581,29 @@ msgstr ""
 "Proporciona funcionalidad para marcar un calendario o una libreta de "
 "direcciones como el o la predeterminada."
 
-#: ../plugins/email-custom-header/email-custom-header.c:535
+#: ../plugins/email-custom-header/email-custom-header.c:562
 msgid "_Custom Header"
 msgstr "_Cabeceras personalizadas"
 
+#: ../plugins/email-custom-header/email-custom-header.c:883
+msgid "Key"
+msgstr "Clave"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Valores"
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+"El formato para especificar el valor de una clave de cabecera personalizada "
+"es:\n"
+"Valores clave del nombre de la cabecera personalizada separados por «;»."
+
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
 msgid "Email Custom Header"
 msgstr "Cabeceras personalizadas del correo-e"
@@ -16341,7 +16618,7 @@ msgid "Custom Header"
 msgstr "Cabecera personalizada"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Header"
+msgid "List of Custom Headers"
 msgstr "Lista de cabeceras personalizadas"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
@@ -16457,33 +16734,33 @@ msgstr "Tamaño de las carpetas"
 msgid "Exchange Settings"
 msgstr "Configuración de Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:674
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "URL _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:700
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "A_utenticar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:721
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
 msgid "_Mailbox:"
 msgstr "_Buzón:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:922
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "Tipo de _autenticación"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "_Comprobar tipos soportados "
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1048
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KiB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1050
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -16704,7 +16981,7 @@ msgstr "Tamaño de la carpeta"
 msgid "User"
 msgstr "_Usuario"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Subscribirse a la carpeta de otro usuario"
@@ -17034,10 +17311,16 @@ msgid "Could not update out-of-office state"
 msgstr "No es posible actualizar el estado de disponibilidad"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+"Evolution requiere reiniciarse para cargar el buzón de correo del usuario "
+"suscrito"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "La cuenta de Exchange está desconectada."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -17064,32 +17347,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Falló al actualizar delegados:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "La carpeta ya existe"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "La carpeta no existe"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Carpeta desconectada"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 #: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "Error genérico"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "No es posible llegar al Servidor de Catálogo Global"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -17097,73 +17380,73 @@ msgstr ""
 "Si OWA se está ejecutando en una ruta diferente, debe especificarla en el "
 "diálogo de configuración de cuenta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "El buzón de {0} no está en este servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "Asegúrese de que la URL es correcta e intente de nuevo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 "Asegúrese de que el nombre del servidor esté escrito correctamente e "
 "inténtelo de nuevo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr "Asegúrese de que el usuario y contraseña son correctos e intente de nuevo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "No hay un servidor de Catálogo Global configurado para esta cuenta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "No hay buzón para el usuario {0} en {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "No existe ese usuario {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "Contraseña cambiada con éxito."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr "Introduzca la Id del delegado o deseleccione la opción Enviar como delegado."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Asegúrese de que el nombre del Servidor de Catálogo Global es correcto."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Por favor, reinicie Evolution para que los cambios tengan efecto"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Seleccione un usuario."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "El servidor rechazó la contraseña porque es demasiado débil."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "La cuenta de Exchange se desactivará cuando salga de Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "La cuenta de Exchange se eliminará cuando salga de Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "El servidor Exchange no es compatible con Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17171,7 +17454,7 @@ msgstr ""
 "El servidor está funcionando con Exchange 5.5. Exchange Connector\n"
 "sólo soporta Microsoft Exchange 2000 y 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17185,57 +17468,58 @@ msgstr ""
 "\n"
 "O quizá tan sólo ha escrito mal la contraseña."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "Inténtelo con una contraseña diferente."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "No puede añadirse el usuario a la lista de control de acceso:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Imposible editar delegados."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Error desconocido al buscar {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/google-account-setup/google-source.c:597
 msgid "Unknown error."
 msgstr "Error desconocido."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Tipo desconocido"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Operación no soportada"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Está cerca de su cuota disponible para almacenar correo en este servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr "Le está permitido mandar un mensaje en nombre de a un solo delegado cada vez."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "No puede hacerse así mismo su propio delegado"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Ha excedido su cuota para almacenar correo en este servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "Sólo puede configurar una sola cuenta de Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -17243,13 +17527,13 @@ msgstr ""
 "Su uso actual es: {0} Kib. Intente hacer algo de espacio borrando algunos "
 "mensajes."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr "Su uso actual es: {0} Kib. No podrá ni enviar ni recibir correo ahora."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17257,19 +17541,19 @@ msgstr ""
 "Su uso actual es: {0} Kib. No podrá enviar correo hasta que haga algo de "
 "espacio borrando algunos mensajes."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "Su contraseña ha caducado."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} no puede añadirse a la lista de control de acceso"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} ya es un delegado"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} ya está en la lista"
 
@@ -17327,8 +17611,8 @@ msgstr ""
 "complemento. Inténtelo estableciendo un editor diferente."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "Redactar en un editor externo"
+msgid "Compose in _External Editor"
+msgstr "Redactar en un editor _externo"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
@@ -17392,14 +17676,60 @@ msgstr "Desuscribirse de carpetas"
 msgid "_Unsubscribe"
 msgstr "Des_uscribir"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:83
+#: ../plugins/google-account-setup/google-source.c:90
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-source.c:493
+msgid "Please enter user name first."
+msgstr "Introduzca el nombre de usuario primero."
+
+#: ../plugins/google-account-setup/google-source.c:497
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr ""
+"Introduzca la contraseña para que el usuario %s acceda a la lista de "
+"calendarios suscritos."
+
+#: ../plugins/google-account-setup/google-source.c:597
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"No se pueden leer los datos del servidor de Google.\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:747
+msgid "Cal_endar:"
+msgstr "Cal_endario:"
+
+#: ../plugins/google-account-setup/google-source.c:782
+msgid "Retrieve _list"
+msgstr "Obtener _lista"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+msgid "<b>Server</b>"
+msgstr "<b>Servidor</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+msgid "Username:"
+msgstr "Usuario:"
+
+#. Translators: This is the first half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
+#: ../plugins/google-account-setup/google-contacts-source.c:233
+msgid "Update every"
+msgstr "Actualizar cada"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "Un complemento para configurar el calendario de Google."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "Un complemento para configurar el calendario y los contactos de Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
@@ -17510,12 +17840,6 @@ msgstr "Retractar correo"
 msgid "Add Send Options to groupwise messages"
 msgstr "Añadir opciones de envío a los mensajes de Groupwise"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Opciones de envío"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Un complemento para las características en las cuentas Groupwise."
@@ -17567,25 +17891,29 @@ msgstr "La cuenta ya existe"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
 msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
 msgstr ""
 "El inicio de sesion como &quot;{0}&quot; en el proxy ha fallado. Compruebe "
-"el ID del correo-e y compruebe de nuevo."
+"su dirección de correo-e e inténtelo de nuevo."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 msgid "This is a recurring meeting"
 msgstr "Esta es una cita repetitiva"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-msgid "What would you like to {0}?"
-msgstr "¿Qué desearía {0}?"
+msgid "Would you like to accept it?"
+msgstr "¿Quiere aceptarlo?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "Would you like to decline it?"
+msgstr "¿Quiere rechazarlo?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
 msgid "You cannot share folder with specified user &quot;{0}&quot;"
 msgstr "No puede compartir la carpeta con el usuario especificado &quot;{0}&quot;"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "You have to specify a user name whom you want to add to the list"
 msgstr "Tiene que especificar el nombre de usuario que quiere añadir a la lista"
 
@@ -18093,31 +18421,31 @@ msgstr ""
 "Para procesar todos estos elementos, el archivo debería guardarse y el "
 "calendario importarse"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2147
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "Esta reunión se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2150
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "Esta tarea se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2153
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "Esta nota se repite"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2382
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "_Borrar el mensaje después de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2392
-#: ../plugins/itip-formatter/itip-formatter.c:2424
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "Búsqueda de conflictos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2407
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione los calendario en los que buscar conflictos entre reuniones"
 
@@ -18549,42 +18877,42 @@ msgid "_Update"
 msgstr "_Actualizar"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1010
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "Hora de inicio:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "Hora de fin:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1035
-#: ../plugins/itip-formatter/itip-view.c:1085
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../plugins/itip-formatter/itip-view.c:1071
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "Send _reply to sender"
 msgstr "_Responder al remitente"
 
-#: ../plugins/itip-formatter/itip-view.c:1099
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Send _updates to attendees"
 msgstr "Mandar _actualizaciones a los participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:1108
+#: ../plugins/itip-formatter/itip-view.c:1110
 msgid "_Apply to all instances"
 msgstr "_Aplicar a todas las instancias"
 
-#: ../plugins/itip-formatter/itip-view.c:1117
+#: ../plugins/itip-formatter/itip-view.c:1119
 msgid "Show time as _free"
 msgstr "Mostrar hora como _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "_Tareas:"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "Notas:"
 
@@ -18643,7 +18971,9 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Genera un mensaje D-BUS cuando llega un mensaje de correo nuevo."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "If true, then beep, otherwise will play sound file when new messages arrive."
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr ""
 "Si está activado pitará, de otra manera reproducirá un archivo de sonido "
 "cuando lleguen mensajes nuevos."
@@ -18696,12 +19026,20 @@ msgstr ""
 "Indica si se deben notificar sólo los mensajes en la carpeta bandeja de "
 "entrada."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "Generar un mensaje _D-Bus"
 
+#: ../plugins/mail-notification/mail-notification.c:378
+msgid "Evolution's Mail Notification"
+msgstr "Notificación de correo de Evolution"
+
+#: ../plugins/mail-notification/mail-notification.c:399
+msgid "Mail Notification Properties"
+msgstr "Propiedades de la notificación de correo"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18716,55 +19054,55 @@ msgstr[1] ""
 "Ha recibido %d mensajes nuevos\n"
 "en %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:463
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Ha recibido %d mensaje nuevo."
 msgstr[1] "Ha recibido %d mensajes nuevos."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
 msgid "New email"
 msgstr "Nuevo correo-e"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:542
 msgid "Show icon in _notification area"
 msgstr "Mostrar icono en el área de _notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:545
 msgid "B_link icon in notification area"
 msgstr "Icono pa_rpadeante en el área de notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:547
 msgid "Popup _message together with the icon"
 msgstr "_Mensaje emergente junto con el icono"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:728
 msgid "_Play sound when new messages arrive"
 msgstr "Re_producir un sonido cuando llegue correo nuevo"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "_Beep"
 msgstr "_Pitar"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:735
 msgid "Play _sound file"
 msgstr "Reproducir archivo de _sonido"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Specify _filename:"
 msgstr "Especificar nombre de a_rchivo:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Select sound file"
 msgstr "Seleccione un arhivo de sonido"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Pl_ay"
 msgstr "Reprod_ucir"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:805
 msgid "Notify new messages for _Inbox only"
 msgstr "Notificar nuevos mensajes sólo para la _bandeja de entrada"
 
@@ -19001,16 +19339,16 @@ msgid "_Unsubscribe from List"
 msgstr "_Desuscribirse de la lista"
 
 #: ../plugins/mark-all-read/mark-all-read.c:37
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "¿Desea marcar todos los mensajes en las subcarpetas como leídos?"
+msgid "Also mark messages in subfolders?"
+msgstr "¿Marcar también los mensajes en las subcarpetas?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:39
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "¿Desea realizar esta operación también en las subcarpetas?"
-
-#: ../plugins/mark-all-read/mark-all-read.c:85
-msgid "Mark All Messages as Read"
-msgstr "Marcar todos los mensajes como leídos"
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr ""
+"¿Quiere marcar los mensajes como leídos sólo en la carpeta actual o en la capeta actual "
+"y todas sus subcarpetas?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:162
 msgid "Current Folder and _Subfolders"
@@ -19363,7 +19701,6 @@ msgid "MIME Type"
 msgstr "Tipo MIME"
 
 #: ../plugins/save-attachments/save-attachments.c:347
-#: ../ui/evolution-editor.xml.h:12
 msgid "Save"
 msgstr "Guardar"
 
@@ -19497,12 +19834,12 @@ msgid "Show _only this Task List"
 msgstr "Mostrar _sólo esta lista de tareas"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that manages the Startup wizard."
-msgstr "Un complemento que gestiona el asistente de inicio."
+msgid "Guides you through your initial account setup."
+msgstr "Le guía a través de su configuración inicial de cuenta."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "Asistente de inicio"
+msgid "Setup Assistant"
+msgstr "Asistente de configuración"
 
 #: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
@@ -19570,6 +19907,30 @@ msgstr "Agrupar mensajes según el asunto"
 msgid "F_all back to threading messages by subject"
 msgstr "Agrupar los mensajes por _asunto"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Lista de pares de palabras clave y valores para que el complemento de "
+"plantillas sustituya en el cuerpo del mensaje."
+
+#: ../plugins/templates/templates.c:614
+msgid "No title"
+msgstr "Sin título"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Guardar como plan_tilla"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Guardar como plantilla"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Borradores basados en el complemento de plantillas"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "Un complemento sencillo que usa ytnef para decodificar adjuntos TNEF."
@@ -19578,6 +19939,28 @@ msgstr "Un complemento sencillo que usa ytnef para decodificar adjuntos TNEF."
 msgid "TNEF Attachment decoder"
 msgstr "Decodificador de adjuntos TNEF"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "Un complemento para configurar contactos WebDAV."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "Contactos WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgstr "_Evitar IfMatch (necesario en Apache < 2.2.8)"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Intérprete de Evolution"
@@ -19653,13 +20036,14 @@ msgstr "Id o alias del componente que se mostrará al iniciar."
 #: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and locally stored password in .gnome2_private/."
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 "Si es «true» entonces las conexiones con el proxy requerirán autenticación. "
-"El combo usuario/contraseña está definido en \"/apps/evolution/shell/"
-"network_config/authentication_user\" y la contraseña se almacena ocalmente "
-"en .gnome2_private/."
+"El usuario se obtiene de la clave de GConf \"/apps/evolution/shell/"
+"network_config/authentication_user\" y la contraseña de gnome-keyring o bien "
+"del archivo de contrasñeas ~/.gnome2_private/Evolution."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
@@ -19953,29 +20337,9 @@ msgstr "Importar un _único archivo"
 msgid "Evolution Preferences"
 msgstr "Preferencias de Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "No ha especificado un nombre de carpeta."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "El nombre de la carpeta no puede contener el carácter de retorno de carro."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "El nombre de la carpeta no puede contener el carácter «/»."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "El nombre de la carpeta no puede contener el carácter «#»."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' y '..' son nombres reservados de carpetas."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:335
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -20000,7 +20364,7 @@ msgstr "No es posible ejecutar Bug Buddy."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:742
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Jorge González <jorgegonz@svn.gnome.org>, 2007-2008\n"
@@ -20011,39 +20375,47 @@ msgstr ""
 "Eneko Lacunza <enlar@iname.com>, 2001-2002\n"
 "Carlos Perelló Marín <carlos@gnome-db.org>, 2000-2001"
 
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Página web de Evolution"
 
-#: ../shell/e-shell-window-commands.c:771
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Error al abrir la página web de P+F."
 
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Trabajar desconectado"
 
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: ../shell/e-shell-window.c:384
-msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "Evolution está conectado. Pulse este botón para trabajar desconectado."
+#: ../shell/e-shell-window.c:377
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
+msgstr ""
+"Evolution está conectado.\n"
+"Pulse este botón para trabajar desconectado."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution está en proceso de desconectarse."
 
-#: ../shell/e-shell-window.c:398
-msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "Evolution está desconectado. Pulse este botón para trabajar conectado."
+#: ../shell/e-shell-window.c:391
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+msgstr ""
+"Evolution está desconectado.\n"
+"Pulse este botón para trabajar conectado."
 
-#: ../shell/e-shell-window.c:807
+#: ../shell/e-shell-window.c:782
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
@@ -20073,9 +20445,9 @@ msgstr "No es posible registrar en OAF"
 msgid "Configuration Database not found"
 msgstr "No se encontró la base de datos de configuración"
 
-#: ../shell/e-user-creatable-items-handler.c:671
-#: ../shell/e-user-creatable-items-handler.c:681
-#: ../shell/e-user-creatable-items-handler.c:686
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "Nuevo"
 
@@ -20084,6 +20456,7 @@ msgid "New Test"
 msgstr "Prueba nueva"
 
 #: ../shell/test/evolution-test-component.c:108
+msgctxt "New"
 msgid "_Test"
 msgstr "_Prueba"
 
@@ -20979,7 +21352,7 @@ msgstr "Renombra la carpeta seleccionada"
 
 #: ../ui/evolution-addressbook.xml.h:30
 msgid "S_ave Address Book As VCard"
-msgstr "G_uarda la libreta de direcciones como VCard"
+msgstr "G_uardar la libreta de direcciones como VCard"
 
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
@@ -20997,7 +21370,7 @@ msgstr "Guarda los contactos de la carpeta seleccionada como VCard"
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
@@ -21066,7 +21439,7 @@ msgstr "_Mover contacto a…"
 msgid "_Move Folder Contacts To"
 msgstr "_Mover contactos de la carpeta a"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nuevo"
 
@@ -21204,193 +21577,6 @@ msgstr "Semana laboral"
 msgid "_Open Appointment"
 msgstr "_Abrir cita"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Pulse aquí para adjuntar un archivo"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Pulse aquí para cerrar la ventana actual"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Pulse aquí para guardar la vista actual"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Pulse aquí para ver la ayuda disponible"
-
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "Cerrar"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Copia el texto seleccionado al portapapeles"
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Corta el texto seleccionado al portapapeles"
-
-#: ../ui/evolution-editor.xml.h:10
-msgid "I_nsert"
-msgstr "_Insertar"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Pega texto desde el portapapeles"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Selecciona todo el texto"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "Ay_uda"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Opciones"
-
-# 'Acontecimiento para todo el día' no cabe
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Todo el día"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Acontecimiento para todo el _día"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Clasificar como confidencial"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Clasificar como privado"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Clasificar como público"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Pulse aquí para poner o quitar alertas para este acontecimiento"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Opciones de envío avanzadas"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Convertir en acontecimiento repetitivo"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Pú_blico"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Consultar información de disponibilidad para los participantes"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "Campo «_Rol»"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "_Opciones de envío"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Mostrar hora como _ocupada"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "_Zona horaria"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Cambia indicando si se muestra el campo «Tipo de participante»"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Conmuta cuando se muestra el campo «Confirmar»"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Conmuta cuando se muestra el campo «Rol»"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Conmuta cuando se muestra el campo «Estado»"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Conmuta cuando se muestra la «Zona horaria»"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Conmuta cuando se muestran las categorías"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Se activa cuando se tiene un «Acontecimiento para todo el día»"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Se activa cuando se deben mostrar la hora como ocupada"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Alertas"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Categorías"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Clasificación"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Confidencial"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Disponibilidad"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Privado"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_Confirmar"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Repetición"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "Campo de _estado"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "Campo de _tipo"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Cancela la operación de correo actual"
@@ -22094,6 +22280,10 @@ msgstr "_Ampliar"
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Cerrar"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Barra de herramientas principal"
@@ -22130,22 +22320,6 @@ msgstr "Ver la nota seleccionada"
 msgid "_Open Memo"
 msgstr "_Abrir nota"
 
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Pulse para cambiar / ver los detalles del estado de la tarea"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Detalles del estado"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Zona horaria"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "Detalles de _estado"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Copia las tareas seleccionadas"
@@ -22341,50 +22515,54 @@ msgid "View/Hide the Status Bar"
 msgstr "Ver/Ocultar la barra de estado"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "Trabajar _desconectado"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_Acerca de"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Cerrar ventana"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "_Olvidar contraseñas"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "_Preguntas más frecuentes"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "_Ocultar botones"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "Sólo _iconos"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Referencia rápida"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "Apariencia del _selector"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "Opciones de _sincronización…"
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "Sólo _texto"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Ventana"
 
@@ -22599,36 +22777,10 @@ msgstr "Tipo de vista"
 msgid "Type of view:"
 msgstr "Tipo de vista:"
 
-#: ../widgets/misc/e-attachment-bar.c:108
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u byte"
-msgstr[1] "%u bytes"
-
-#: ../widgets/misc/e-attachment-bar.c:114
-#, c-format
-msgid "%.1f KB"
-msgstr "%.1f KiB"
-
-#: ../widgets/misc/e-attachment-bar.c:117
-#, c-format
-msgid "%.1f MB"
-msgstr "%.1f MiB"
-
-#: ../widgets/misc/e-attachment-bar.c:120
-#, c-format
-msgid "%.1f GB"
-msgstr "%.1f GiB"
-
-#: ../widgets/misc/e-attachment-bar.c:1168
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Barra de adjuntos"
 
-#: ../widgets/misc/e-attachment-bar.c:1414
-msgid "Recent Docu_ments"
-msgstr "Docu_mentos recientes"
-
 #: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
 #: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
@@ -22707,16 +22859,16 @@ msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Ancho mínimo"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Ancho mínimo"
 
@@ -22981,6 +23133,14 @@ msgstr ""
 "horaria. Los usuarios que sólo dispongan de teclado pueden, en su lugar, "
 "seleccionar la zona horaria desde la caja combinada desplegable inferior."
 
+#: ../widgets/misc/e-online-button.c:112
+msgid "Online"
+msgstr "En línea"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr "El botón de estado está en línea"
+
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Sincronizar con:"
@@ -23005,35 +23165,35 @@ msgstr "Modelo de reflujo"
 msgid "Column width"
 msgstr "Anchura de columna"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "Buscar"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "Pulse aquí para cambiar el tipo de búsqueda"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "_Buscar"
 
 # En conflicto con _Buscar del menu principal
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "B_uscar ahora"
 
 # Conflicto con _Ver del menú principal
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "Vacia_r"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "ID de elemento"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Texto"
@@ -23041,19 +23201,19 @@ msgstr "Texto"
 # #En conflicto con _Mensaje
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1009
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "M_ostrar: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1026
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "_Buscar: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1038
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " e_n "
 
@@ -23209,14 +23369,14 @@ msgid "_When opened:"
 msgstr "_Al abrir:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:289
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (…)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:295
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
@@ -23432,81 +23592,81 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d elemento)"
 msgstr[1] "%s (%d elementos)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Alternar colores de las filas"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
 #: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "Dibujar rejilla horizontal"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
 #: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "Dibujar rejilla vertical"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
 #: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "Dibujar el foco"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Modo del cursor"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Modelo de selección"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
 #: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "Umbral de longitud"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
 #: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "Altura uniforme de la fila"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "Congelado"
 
@@ -23582,24 +23742,24 @@ msgstr "Ordenar información"
 msgid "Tree"
 msgstr "Árbol"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Cabecera de la tabla"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Modelo de la tabla"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Fila del cursor"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
 #: ../widgets/table/e-tree.c:3356
 msgid "Always search"
 msgstr "Buscar siempre"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Pulsar para añadir"
 
diff --git a/po/fr.po b/po/fr.po
index 902be38811..c2c7f864f9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,13 +21,14 @@
 # Myriam Malga <mmalga@redhat.com>, 2007.
 # Bruno Brouard <annoa.b@gmail.com>, 2008.
 #
+#: ../shell/main.c:683
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-07 18:43+0100\n"
-"PO-Revision-Date: 2008-03-07 22:33+0100\n"
-"Last-Translator: Bruno Brouard <annoa.b@gmail.com>\n"
+"POT-Creation-Date: 2008-07-24 21:44+0200\n"
+"PO-Revision-Date: 2008-07-24 21:42+0200\n"
+"Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,21 +37,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution addressbook"
 msgstr "carnet d'adresses d'Evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../a11y/addressbook/ea-minicard-view.c:32
 #: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Nouveau contact"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../a11y/addressbook/ea-minicard-view.c:33
 #: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Nouvelle liste de contacts"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -58,7 +59,6 @@ msgstr[0] "dossier actuel du carnet d'adresses %s possède %d carte"
 msgstr[1] "dossier actuel du carnet d'adresses %s possède %d cartes"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Ouvrir"
 
@@ -168,7 +168,7 @@ msgid "calendar view for one or more days"
 msgstr "vue du calendrier pour un ou plusieurs jours"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:758
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -179,20 +179,18 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:1363
-#: ../calendar/gui/e-day-view.c:2162
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/calendar-component.c:761
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
+#: ../calendar/gui/e-week-view-main-item.c:340
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:768
+#: ../calendar/gui/calendar-component.c:770
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -200,10 +198,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:797
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -213,17 +211,15 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:1367
-#: ../calendar/gui/e-day-view.c:2178
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/calendar-component.c:787
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
+#: ../calendar/gui/e-week-view-main-item.c:354
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:247
 #: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:772
+#: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "Calendrier de GNOME"
 
@@ -335,35 +331,35 @@ msgstr "Calendrier : du %s au %s"
 msgid "evolution calendar item"
 msgstr "élément du calendrier d'Evolution"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:39
 msgid "Combo Button"
 msgstr "Bouton déroulant"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:49
 msgid "Activate Default"
 msgstr "Utiliser le défaut"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:51
 msgid "Popup Menu"
 msgstr "Menu contextuel"
 
-#: ../a11y/widgets/ea-expander.c:40
+#: ../a11y/widgets/ea-expander.c:39
 msgid "Toggle Attachment Bar"
 msgstr "Affiche/Masque la barre des pièces jointes"
 
-#: ../a11y/widgets/ea-expander.c:50
+#: ../a11y/widgets/ea-expander.c:49
 msgid "activate"
 msgstr "activer"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr ""
-"« {0} » est une source de carnet d'adresses en lecture seule uniquement. "
-"Basculez en vue des contacts et mettez en évidence un carnet d'adresses qui "
-"puisse accepter les contacts."
+"« {0} » est un carnet d'adresses en lecture seule et il ne peut être modifié. "
+"Veuillez sélectionner un autre carnet d'adresses dans le panneau latéral en "
+"mode Contacts."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -413,11 +409,12 @@ msgstr "Impossible de supprimer le carnet d'adresses."
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
-"Actuellement, Evolution ne permet d'accéder qu'au système d'adresses "
-"GroupWise. Utilisez un autre client de messagerie pour avoir accès aux "
-"contacts fréquents et au dossier de contacts personnels de GroupWise."
+"Actuellement, Evolution ne permet d'accéder qu'au carnet d'adresses système "
+"GroupWise. Utilisez une fois un autre client de messagerie Groupwise pour "
+"obtenir les contacts fréquents et les dossiers de contacts personnels de "
+"GroupWise."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
@@ -437,7 +434,7 @@ msgstr "L'authentification sur le serveur LDAP a échoué."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
 msgid "Failed to delete contact"
 msgstr "La suppression du contact a échoué."
 
@@ -450,31 +447,27 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "Le serveur a renvoyé des informations relatives au schéma non valides."
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "Permission refusée."
-
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "Version du serveur"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Il est possible que certaines fonctionnalités ne fonctionnent pas "
 "correctement avec la version actuelle de votre serveur"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Le carnet d'adresses d'Evolution a quitté de façon inattendue."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "L'image que vous avez sélectionnée est grande. Voulez-vous la redimensionner "
 "avant de l'enregistrer ?"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:23
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -485,20 +478,20 @@ msgstr ""
 "Renseignez-vous auprès de votre administrateur sur les bases de recherche "
 "prises en charge."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book will be removed permanently."
 msgstr "Ce carnet d'adresses sera définitivement supprimé."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This addressbook could not be opened."
 msgstr "Ce carnet d'adresses ne peut pas être ouvert."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This addressbook server does not have any suggested search bases."
 msgstr ""
 "Le serveur de carnet d'adresses n'a aucune des bases de recherche suggérées."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -506,29 +499,29 @@ msgstr ""
 "Il se peut que le serveur de carnet d'adresses soit injoignable, que le nom "
 "du serveur contienne une faute ou bien que votre réseau soit coupé."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr ""
 "Ce serveur ne prend pas en charge les informations relatives au schéma "
 "LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to open addressbook"
 msgstr "Impossible d'ouvrir le carnet d'adresses"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "Impossible d'effectuer une recherche."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "Impossible d'enregistrer {0}."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "Voulez-vous enregistrer les modifications ?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -537,7 +530,7 @@ msgstr ""
 "mais il ne peut pas être supprimé de la source. Voulez-vous en faire une "
 "copie à la place ?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -548,6 +541,12 @@ msgstr ""
 "résultats, il est recommandé de mettre à niveau votre serveur vers une "
 "version supportée"
 
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr ""
+"Vous ne disposez pas des droits nécessaires pour supprimer un contact dans "
+"ce carnet d'adresses."
+
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
@@ -587,8 +586,8 @@ msgid "_Use as it is"
 msgstr "_Utiliser tel quel"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -597,17 +596,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "Adresse de synchronisation par défaut :"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
 msgid "Could not load addressbook"
 msgstr "Impossible de charger le carnet d'adresses"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "Impossible de lire les données de l'application Adresses du Pilot"
 
@@ -629,10 +628,10 @@ msgstr "Configurez la complétion automatique ici"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
 msgstr "Contacts"
 
@@ -641,8 +640,8 @@ msgid "Evolution Address Book"
 msgstr "Carnet d'adresses d'Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
-msgstr "Pop-up d'adresse du carnet d'adresses d'Evolution"
+msgid "Evolution Address Book address popup"
+msgstr "Fenêtre surgissante d'adresse du carnet d'adresses d'Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book address viewer"
@@ -673,11 +672,12 @@ msgstr "Gérez vos certificats S/MIME ici"
 #: ../addressbook/gui/component/addressbook-component.c:144
 #: ../addressbook/gui/component/addressbook-migrate.c:499
 #: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:583 ../calendar/gui/migration.c:1096
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:307
-#: ../mail/mail-vfolder.c:216
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "Sur cet ordinateur"
 
@@ -690,15 +690,16 @@ msgstr "Sur cet ordinateur"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:591 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Personnel"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "Sur les serveurs LDAP"
@@ -720,7 +721,7 @@ msgid "Create a new contact list"
 msgstr "Crée une nouvelle liste de contacts"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-config.c:1192
 msgid "New Address Book"
 msgstr "Nouveau carnet d'adresses"
 
@@ -738,72 +739,72 @@ msgstr ""
 "Échec lors de la mise à jour des paramètres ou des dossiers du carnet "
 "d'adresses."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:315
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:516
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Type :"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:618
 msgid "Copy _book content locally for offline operation"
 msgstr "Copier localement le contenu du _carnet pour les opérations hors ligne"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/addressbook-config.c:967
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../calendar/gui/dialogs/calendar-setup.c:388
+#: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Général"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:972
 msgid "Server Information"
 msgstr "Informations sur le serveur"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:974
 msgid "Authentication"
 msgstr "Authentification"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:977
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Détails"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../addressbook/gui/component/addressbook-config.c:978
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "Recherche"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:980
 msgid "Downloading"
 msgstr "Téléchargement"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1190
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Propriétés du carnet d'adresses"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migration..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migration de « %s » :"
@@ -859,48 +860,48 @@ msgstr ""
 "\n"
 "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
+#: ../addressbook/gui/component/addressbook-view.c:430
 #: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renommer le dossier « %s » en :"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../addressbook/gui/component/addressbook-view.c:433
 #: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "Renommer le dossier"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
+#: ../addressbook/gui/component/addressbook-view.c:438
 #: ../mail/em-folder-utils.c:511
 msgid "Folder names cannot contain '/'"
 msgstr "Les noms des dossiers ne peuvent pas contenir le caractère « / »"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "_New Address Book"
 msgstr "_Nouveau carnet d'adresses"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:951
 msgid "Save As vCard..."
 msgstr "Enregistrer comme vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2090 ../mail/em-folder-view.c:1346
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/calendar-component.c:620
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../mail/em-folder-tree.c:2095 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:957
 msgid "_Properties..."
 msgstr "_Propriétés..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "Sélecteur de source des contacts"
 
@@ -909,19 +910,19 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accès anonyme au serveur LDAP"
 
 #: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "L'authentification a échoué.\n"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Saisissez le mot de passe pour %s (utilisateur %s)"
 
 #: ../addressbook/gui/component/addressbook.c:215
 #: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "Saisissez le mot de passe"
@@ -1002,106 +1003,98 @@ msgid "<b>Authentication</b>"
 msgstr "<b>Authentification</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>Affichage</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>Téléchargement</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>Recherche</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>Informations sur le serveur</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>Type :</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "Ajouter carnet d'adresses"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:777
+#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../mail/em-account-editor.c:761
 msgid "Always"
 msgstr "Toujours"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "Anonymement"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Basic"
 msgstr "Basique"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Distinguished name"
 msgstr "Nom distinctif"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Email address"
 msgstr "Adresse électronique"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution utilisera cette adresse électronique pour vous authentifier auprès "
 "du serveur."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Find Possible Search Bases"
 msgstr "Trouver les bases de recherche possibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Lo_gin:"
 msgstr "Co_nnexion :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "Jamais"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:304
+#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Sans chiffrement"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "One"
 msgstr "Un"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:312
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "Chiffrement SSL"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search Filter"
 msgstr "Filtre de recherche"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "Ba_se de recherche :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search _filter:"
 msgstr "_Filtre de recherche :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search filter"
 msgstr "Filtre de recherche"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1111,7 +1104,7 @@ msgstr ""
 "celui-ci n'est pas modifié, la recherche par défaut sera effectuée sur la "
 "classe objet du type « personne »."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1119,7 +1112,7 @@ msgstr ""
 "Sélectionner cette option signifie que Evolution se connectera à votre "
 "serveur LDAP uniquement si votre serveur LDAP prend en charge SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1127,7 +1120,7 @@ msgstr ""
 "Sélectionner cette option signifie que Evolution se connectera à votre "
 "serveur LDAP uniquement si votre serveur LDAP prend en charge TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1137,23 +1130,23 @@ msgstr ""
 "SSL ni TLS. Cela signifie que votre connexion ne sera pas sécurisée et que "
 "vous serez vulnérable aux failles de sécurité."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Sub"
 msgstr "Sous"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Bases de recherche prises en charge"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:308
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "Chiffrement TLS"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -1163,7 +1156,7 @@ msgstr ""
 "recherches devront débuter. Si vous ne renseignez pas ce champ, la recherche "
 "débutera à la racine de l'arborescence du dossier."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -1175,7 +1168,7 @@ msgstr ""
 "les entrées sous la base de recherche. Un domaine de recherche « one » "
 "inclura les entrées se trouvant un niveau en dessous de la base."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1183,7 +1176,7 @@ msgstr ""
 "Ceci représente le nom complet de votre serveur LDAP. Par exemple, « ldap."
 "monentreprise.com »."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1191,17 +1184,17 @@ msgstr ""
 "Ceci représente le nombre maximum d'entrées à télécharger. Un nombre trop "
 "élevé ralentira l'accès à votre carnet d'adresses."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 "Ceci est la méthode qui sera utilisée par Evolution pour vous authentifier. "
-"Notez que spécifier « Adresse électronique » implique l'accès anonyme à "
-"votre serveur LDAP."
+"Notez que spécifier « Adresse électronique » implique l'accès anonyme à votre "
+"serveur LDAP."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1209,7 +1202,7 @@ msgstr ""
 "Ceci représente le nom du serveur tel qu'il apparaîtra dans la liste des "
 "dossiers d'Evolution. Il est utilisé pour l'affichage uniquement."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -1219,75 +1212,75 @@ msgstr ""
 "connecter. Une liste de ports standard est fournie. Demandez à votre "
 "administrateur système le port à utiliser."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "En utilisant le nom distinctif (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "En utilisant l'adresse électronique"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Whenever Possible"
 msgstr "Lorsque c'est possible"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Address Book"
 msgstr "_Ajouter carnet d'adresses"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Limite de _téléchargement :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Find Possible Search Bases"
 msgstr "_Trouver les bases de recherche possibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Login method:"
 msgstr "_Méthode d'identification :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Port:"
 msgstr "_Port :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "_Search scope:"
 msgstr "Domain_e de recherche :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "S_erveur :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Timeout:"
 msgstr "_Délai :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Use secure connection:"
 msgstr "_Utiliser une connexion sécurisée :"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "cards"
 msgstr "cartes"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:401
 msgid "minutes"
 msgstr "minutes"
 
@@ -1328,7 +1321,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Bureau</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1340,16 +1333,16 @@ msgid "Ca_tegories..."
 msgstr "Ca_tégories..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Contact"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
 msgid "Contact Editor"
 msgstr "Éditeur de contacts"
 
@@ -1362,7 +1355,7 @@ msgid "Image"
 msgstr "Image"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "Messagerie MSN"
 
@@ -1375,7 +1368,7 @@ msgid "Nic_kname:"
 msgstr "_Surnom :"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1389,11 +1382,11 @@ msgstr "Téléphone"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Bureau"
 
@@ -1415,9 +1408,9 @@ msgid "_Birthday:"
 msgstr "Date de _naissance :"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1848
 msgid "_Calendar:"
 msgstr "C_alendrier :"
 
@@ -1505,1119 +1498,1121 @@ msgstr "_Où :"
 msgid "_Zip/Postal Code:"
 msgstr "_Code postal :"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "Adresse"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "Modifiable"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "États-Unis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "Albanie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "Algérie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "Samoa (US)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "Andorre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "Antarctique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Antigua And Barbuda"
 msgstr "Antigua et Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "Argentine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "Arménie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "Australie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "Autriche"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "Azerbaïdjan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "Bahreïn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "Barbade"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "Biélorussie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "Belgique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "Bénin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "Bermudes"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "Bhoutan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "Bolivie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnie Herzégovine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "Botswana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "Île Bouvet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "Brésil"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "British Indian Ocean Territory"
 msgstr "Territoire britannique de l'océan Indien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "Brunéi Darussalam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "Bulgarie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "Burkina-Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "Cambodge"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "Cameroun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "Canada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "Cap Vert"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "Îles Caïman"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Central African Republic"
 msgstr "République Centrafricaine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "Tchad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "Chili"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "Chine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "Île Christmas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Cocos (Keeling) Islands"
 msgstr "Îles Cocos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "Colombie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "Comores"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "Congo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Congo, République démocratique du"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "Îles Cook"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "Côte d'Ivoire"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "Croatie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "Cuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "Chypre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "République Tchèque"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "Danemark"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "Dominique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "République Dominicaine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "Équateur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "Égypte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "Guinée Équatoriale"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "Érythrée"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "Estonie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "Éthiopie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "Îles Malouines"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "Îles Féroé"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "Îles Fidji"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "Finlande"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "France"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "Guyane Française"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "Polynésie Française"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "French Southern Territories"
 msgstr "Terres Australes Françaises"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "Gabon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "Gambie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "Géorgie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "Allemagne"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "Grèce"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "Groenland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "Grenade"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "Guernesey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "Guinée"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
-msgstr "Guinée Bissau"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guinea-Bissau"
+msgstr "Guinée-Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "Guyane"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "Haïti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Heard And McDonald Islands"
 msgstr "Îles Heard et McDonald"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "Vatican"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "Hongrie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "Islande"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "Inde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "Indonésie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "Iran"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "Irlande"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israël"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "Italie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "Jamaïque"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "Japon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "Jordanie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Corée, République démocratique populaire de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Korea, Republic Of"
 msgstr "Corée (République de)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "Koweït"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "Lettonie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "Liban"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "Libye"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "Lituanie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "Macédoine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "Malaisie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "Maldives"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "Malte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "Îles Marshall"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "Martinique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "Mauritanie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "Maurice"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "Mexique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "Micronésie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Moldova, Republic Of"
 msgstr "Moldavie (République de)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "Monaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "Mongolie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "Maroc"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "Birmanie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "Namibie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "Népal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "Pays-Bas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "Antilles Néerlandaises"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "Nouvelle Calédonie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "Nouvelle Zélande"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "Niger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "Île Norfolk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Northern Mariana Islands"
 msgstr "Îles Marianes"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "Norvège"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "Oman"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "Territoire Palestinien"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "Panama"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Papua New Guinea"
 msgstr "Papouasie Nouvelle Guinée"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "Pérou"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "Philippines"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "Pologne"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "Porto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "La Réunion"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "Roumanie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "Russie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Kitts And Nevis"
 msgstr "St Kitts et Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "Sainte Lucie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Saint Vincent And The Grenadines"
 msgstr "Saint-Vincent-et-les-Grenadines"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "San Marin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome et Principe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "Arabie Saoudite"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "Sénégal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Serbia And Montenegro"
 msgstr "Serbie et Monténégro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "Singapour"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "Slovaquie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "Slovénie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "Îles Salomon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "Somalie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "Afrique du Sud"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Géorgie du Sud et Îles Sandwich"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "Espagne"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "St Hélène"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre et Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "Soudan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Îles Svalbard et Jan Mayen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "Suède"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "Suisse"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "Syrie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "Tadjikistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzanie (République Unie de)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "Thaïlande"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "Timor oriental"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Trinidad And Tobago"
 msgstr "Trinidad et Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "Tunisie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "Turquie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "Turkménistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Turks And Caicos Islands"
 msgstr "Îles Turks et Caïques"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "Ouganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Arab Emirates"
 msgstr "Émirats Arabes Unis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "Royaume-Uni"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "United States Minor Outlying Islands"
 msgstr "Îles isolées (US)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "Ouzbékistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "Vénézuéla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, British"
 msgstr "Îles Vierges britanniques"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Virgin Islands, U.S."
 msgstr "Îles Vierges américaines"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Wallis And Futuna Islands"
 msgstr "Îles Wallis et Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "Sahara Occidental"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "Yémen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "Zambie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../plugins/exchange-operations/exchange-delegates.c:952
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
+#: ../plugins/plugin-manager/plugin-manager.c:41
+#: ../plugins/save-attachments/save-attachments.c:350
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Nom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "AOL Instant Messenger"
 msgstr "Messagerie instantanée AOL"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Yahoo Messenger"
 msgstr "Messagerie Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "Messagerie Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
 msgid "Service"
 msgstr "Service"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "Emplacement"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Domicile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Autre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Source Book"
 msgstr "Livre source"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Target Book"
 msgstr "Livre cible"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
 msgid "Is New Contact"
 msgstr "Nouveau contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Writable Fields"
 msgstr "Champs modifiables"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Required Fields"
 msgstr "Champs requis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Modifié"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Éditeur de contacts - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "Please select an image for this contact"
 msgstr "Sélectionnez une image pour ce contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "_No image"
 msgstr "_Aucune image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2625,47 +2620,47 @@ msgstr ""
 "La donnée sur le contact n'est pas valide :\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "« %s » n'a pas un format valide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s « %s » n'a pas un format valide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s « %s » est vide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
 msgid "Invalid contact."
 msgstr "Contact non valide."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "Ajout express de contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "Mo_difier entièrement"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "_Nom complet"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "_Adresse électronique"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "_Sélectionner le carnet d'adresses"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2674,7 +2669,7 @@ msgstr ""
 "Voulez-vous vraiment\n"
 "supprimer cette liste de contacts (%s) ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2682,7 +2677,7 @@ msgstr ""
 "Voulez-vous vraiment\n"
 "supprimer ces listes de contacts ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2691,7 +2686,7 @@ msgstr ""
 "Voulez-vous vraiment\n"
 "supprimer ce contact (%s) ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2835,12 +2830,17 @@ msgstr ""
 msgid "Contact List Members"
 msgstr "Membres de la liste de contacts"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+msgid "_Members"
+msgstr "_Membres"
+
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
 #: ../addressbook/gui/widgets/e-addressbook-model.c:298
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:217
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Carnet"
 
@@ -2848,10 +2848,6 @@ msgstr "Carnet"
 msgid "Is New List"
 msgstr "Est une nouvelle liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "_Membres"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Contact Modifié :"
@@ -2889,40 +2885,39 @@ msgstr ""
 "Le nom ou l'adresse électronique de ce contact existe déjà\n"
 "dans ce dossier. Voulez-vous quand même l'ajouter ?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
 msgid "Merge Contact"
 msgstr "Fusionner le contact"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "_Fusionner"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:860
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Adresse électronique"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
-#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "N'importe quel champ contient"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "L'adresse commence par"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Le nom commence par"
+msgid "Name contains"
+msgstr "Le nom contient"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2937,9 +2932,9 @@ msgstr[1] "%d contacts"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Requête"
 
@@ -2950,9 +2945,9 @@ msgstr "Erreur d'obtention de l'affichage du carnet"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../widgets/text/e-text.c:3551
+#: ../widgets/table/e-table.c:3353
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "Modèle"
 
@@ -2960,107 +2955,109 @@ msgstr "Modèle"
 msgid "Error modifying card"
 msgstr "Erreur lors de la modification de la carte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+msgid "Name begins with"
+msgstr "Le nom commence par"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "Source"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../calendar/gui/e-meeting-list-view.c:508
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Type"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
 msgid "Save as vCard..."
 msgstr "Enregistrer comme vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1566
+#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "_Nouveau contact..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "_Nouvelle liste de contacts..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "_Enregistrer comme vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "_Faire suivre le contact"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "_Faire suivre les contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "Envoyer un _message au contact"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "Envoyer un _message à la liste"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "Envoyer un _message aux contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "Copier vers le carnet d'_adresses..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "_Déplacer vers le carnet d'adresses..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "_Couper"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:996
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1574
+#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:996
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "Co_pier"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "C_oller"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
-#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
-#: ../calendar/gui/cal-search-bar.c:681
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
+#: ../calendar/gui/cal-search-bar.c:680
 msgid "Any Category"
 msgstr "Toutes les catégories"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "Autre erreur"
 
@@ -3095,7 +3092,7 @@ msgstr "Téléphone (voiture)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:169
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3196,9 +3193,9 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:713
 msgid "Role"
 msgstr "Rôle"
 
@@ -3234,38 +3231,38 @@ msgid "Web Site"
 msgstr "Site Web"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
 #: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
+#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Largeur"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Hauteur"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "A le focus"
 
@@ -3285,11 +3282,21 @@ msgstr "Modèle de texte"
 msgid "Max field name length"
 msgstr "Longueur max. du nom du champ"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
 msgid "Column Width"
 msgstr "Largeur des colonnes"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Recherche des contacts..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3303,7 +3310,7 @@ msgstr ""
 "\n"
 "ou double-cliquez ici pour créer un nouveau contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3317,7 +3324,7 @@ msgstr ""
 "\n"
 "Double-cliquez ici pour créer un nouveau contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3327,7 +3334,7 @@ msgstr ""
 "\n"
 "Rechercher le contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3337,40 +3344,41 @@ msgstr ""
 "\n"
 "Il n'y a aucun élément à afficher dans cette vue."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adaptateur"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Adresse électronique (travail)"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Adresse électronique (domicile)"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "Autre adresse électronique"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Sélectionné"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "A le curseur"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
 msgid "_Open Link in Browser"
 msgstr "_Ouvrir un lien dans le navigateur"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "_Copier l'emplacement du lien"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
 msgid "_Send New Message To..."
 msgstr "Envoyer un nouveau _message à..."
 
@@ -3392,7 +3400,7 @@ msgid "map"
 msgstr "carte"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "Membres de la liste"
 
@@ -3413,15 +3421,15 @@ msgid "Video Chat"
 msgstr "Vidéo-conférence"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/gnome-cal.c:2376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:574
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
 #: ../plugins/hula-account-setup/camel-hula-listener.c:378
 #: ../plugins/hula-account-setup/camel-hula-listener.c:407
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -3430,8 +3438,7 @@ msgstr "Calendrier"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "Libre/Occupé"
 
@@ -3453,125 +3460,127 @@ msgid "Web Log"
 msgstr "Journal en ligne"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Date de naissance"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2336
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Anniversaire"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "Fonction"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "Page Web personnelle"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "Succès"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "Moteur de traitement occupé"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "Dépôt hors ligne"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "Le carnet d'adresses n'existe pas"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "No Self Contact defined"
 msgstr "Aucun contact personnel défini"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Permission refusée"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "Contact non trouvé"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "L'ID du contact existe déjà."
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "Protocole non pris en charge"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:635 ../calendar/gui/print.c:2523
 msgid "Canceled"
 msgstr "Annulé"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "Impossible d'annuler"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 #: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "Échec de l'authentification"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "Authentification requise"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS non disponible"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "Aucun message correspondant"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "Non disponible en mode hors ligne"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "Version du serveur non valide"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#: ../addressbook/gui/widgets/eab-gui-util.c:101
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3582,7 +3591,7 @@ msgstr ""
 "téléchargé pour une consultation hors ligne. Veuillez charger ce carnet "
 "d'adresses une fois en mode connecté pour télécharger son contenu."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3591,7 +3600,7 @@ msgstr ""
 "Impossible d'ouvrir ce carnet d'adresses. Vérifiez que le chemin %s existe "
 "et que vous avez les permissions pour y accéder."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3599,7 +3608,7 @@ msgstr ""
 "Impossible d'ouvrir ce carnet d'adresses. Vous avez saisi un URI incorrect "
 "ou le serveur LDAP n'est pas accessible."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3609,7 +3618,7 @@ msgstr ""
 "utiliser LDAP dans Evolution, vous devez installer un paquet d'Evolution "
 "avec support LDAP activé."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3617,7 +3626,7 @@ msgstr ""
 "Impossible d'ouvrir ce carnet d'adresses. Vous avez saisi un URI incorrect "
 "ou le serveur LDAP n'est pas accessible."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3630,7 +3639,7 @@ msgstr ""
 "recherche ou augmenter le nombre maximum de résultats dans\n"
 "les préférences du serveur d'annuaires de ce carnet d'adresses."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3643,49 +3652,49 @@ msgstr ""
 "temps dans les préférences du serveur d'annuaires de ce carnet \n"
 "d'adresses."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Le moteur de traitement du carnet d'adresses n'a pas pu analyser cette "
 "requête."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:169
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "Le moteur de traitement du carnet d'adresses a refusé d'effectuer cette "
 "requête."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid "This query did not complete successfully."
 msgstr "Cette requête ne s'est pas terminée correctement."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
 msgid "Error adding list"
 msgstr "Erreur lors de l'ajout de la liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
 #: ../addressbook/gui/widgets/eab-gui-util.c:670
 msgid "Error adding contact"
 msgstr "Erreur lors de l'ajout du contact"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error modifying list"
 msgstr "Erreur lors de la modification de la liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error modifying contact"
 msgstr "Erreur lors de la modification du contact"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error removing list"
 msgstr "Erreur lors de la suppression de la liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 #: ../addressbook/gui/widgets/eab-gui-util.c:620
 msgid "Error removing contact"
 msgstr "Erreur lors de la suppression du contact"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:299
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3700,16 +3709,16 @@ msgstr[1] ""
 "L'affichage de %d contacts implique l'ouverture de %d nouvelles fenêtres.\n"
 "Voulez-vous vraiment afficher ces contacts ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:307
 msgid "_Don't Display"
 msgstr "_Ne pas afficher"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
 msgid "Display _All Contacts"
 msgstr "Afficher _tous les contacts"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:334
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3718,7 +3727,7 @@ msgstr ""
 "%s existe déjà.\n"
 "Voulez-vous l'écraser ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:338
 msgid "Overwrite"
 msgstr "Écraser"
 
@@ -3761,27 +3770,27 @@ msgstr "Déplacer les contacts vers"
 msgid "Copy contacts to"
 msgstr "Copier les contacts vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:883
 msgid "Multiple vCards"
 msgstr "vCards multiples"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard pour %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:928
 #, c-format
 msgid "Contact information"
 msgstr "Informations sur le contact"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:930
 #, c-format
 msgid "Contact information for %s"
 msgstr "Informations sur le contact %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
 msgid "Querying Address Book..."
 msgstr "Interrogation du carnet d'adresses..."
 
@@ -3809,43 +3818,43 @@ msgstr "Enregistrer dans le carnet d'adresses"
 msgid "Card View"
 msgstr "Affichage de la carte"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../addressbook/importers/evolution-csv-importer.c:658
+#: ../addressbook/importers/evolution-ldif-importer.c:498
 #: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importation..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "Importateur Outlook CSV et Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Importateur Mozilla CSV et Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importateur Evolution CSV et Tab"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "Assistant d'importation LDIF d'Evolution"
 
@@ -3898,11 +3907,11 @@ msgid "Format"
 msgstr "Format"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
 #: ../widgets/table/e-table-field-chooser-item.c:648
 #: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-header-item.c:1908
 #: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
 msgstr "En-tête"
@@ -4005,7 +4014,7 @@ msgstr "Ombrage"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
+#: ../plugins/exchange-operations/exchange-account-setup.c:1055
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -4024,7 +4033,7 @@ msgid "Top:"
 msgstr "Haut :"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:153
 msgid "Type:"
 msgstr "Type :"
 
@@ -4135,14 +4144,24 @@ msgstr "Erreur non gérée"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
-"« {0} » est une source de calendrier en lecture seule. Basculez en vue du "
-"calendrier et mettez en évidence un calendrier qui puisse accepter les "
-"rendez-vous."
+"« {0} » est un calendrier en lecture seule et il ne peut être modifié. "
+"Veuillez sélectionner un autre calendrier dans le panneau latéral en mode "
+"Calendriers."
 
-#: ../calendar/calendar.error.xml.h:3
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:4
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr ""
+"« {0} » est un calendrier en lecture seule et il ne peut être modifié. "
+"Veuillez sélectionner un autre calendrier qui puisse accepter les rendez-"
+"vous."
+
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
@@ -4150,7 +4169,7 @@ msgstr ""
 "Ajouter un résumé compréhensible permet de donner à vos destinataires une "
 "idée sur le but de votre rendez-vous."
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:6
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
@@ -4158,19 +4177,19 @@ msgstr ""
 "Ajouter un résumé compréhensible permet de donner à vos destinataires une "
 "idée sur le but de votre tâche."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
 "Toutes les informations de ces mémos seront supprimées et ne pourront pas "
 "être restaurées."
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
 "Toutes les informations de ce mémo seront supprimées et ne pourront pas être "
 "restaurées."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
@@ -4178,129 +4197,133 @@ msgstr ""
 "Toutes les informations sur ces rendez-vous seront supprimées et ne pourront "
 "pas être restaurées."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 "Toutes les informations de ces tâches seront supprimées et ne pourront pas "
 "être restaurées."
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:11
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "Toutes les informations sur ce rendez-vous seront supprimées et ne pourront "
 "pas être restaurées."
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:12
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Toutes les informations sur cette réunion seront supprimées et ne pourront "
 "pas être restaurées."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 "Toutes les informations de ce mémo seront supprimées et ne pourront pas être "
 "restaurées."
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 "Toutes les informations de cette tâche seront supprimées et ne pourront pas "
 "être restaurées."
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Voulez-vous vraiment supprimer la tâche intitulée « {0} » ?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Voulez-vous vraiment supprimer le rendez-vous intitulé « {0} » ?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Voulez-vous vraiment supprimer le mémo « {0} » ?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Voulez-vous vraiment supprimer ces {0} rendez-vous ?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Voulez-vous vraiment supprimer ces {0} mémos ?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Voulez-vous vraiment supprimer ces {0} tâches ?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Voulez-vous vraiment supprimer ce rendez-vous ?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:179
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Voulez-vous vraiment supprimer cette réunion ?"
 
-#: ../calendar/calendar.error.xml.h:21
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Voulez-vous vraiment supprimer ce mémo ?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Voulez-vous vraiment supprimer cette tâche ?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Voulez-vous vraiment enregistrer le mémo sans résumé ?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Voulez-vous vraiment envoyer le rendez-vous sans résumé ?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Voulez-vous vraiment envoyer la tâche sans résumé ?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
-msgstr "Impossible de créer un nouvel évènement"
+msgstr "Impossible de créer un nouvel événement"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "Impossible d'enregistrer l'événement"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "Supprimer le calendrier « {0} » ?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "Supprimer la liste des mémos « {0} » ?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "Supprimer la liste des tâches « {0} » ?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "_Ne pas envoyer"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Téléchargement en cours. Voulez-vous enregistrer ce rendez-vous ?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Téléchargement en cours. Voulez-vous enregistrer la tâche ?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "L'éditeur ne peut pas être chargé."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4308,26 +4331,26 @@ msgstr ""
 "Des invitations vont être envoyées par courriel à tous les participants, les "
 "autorisant à accepter cette tâche."
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Des invitations vont être envoyées par courriel à tous les participants, les "
 "autorisant à répondre à celle-ci."
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "Erreur lors du chargement du calendrier"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "Erreur lors du chargement de la liste des mémos"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "Erreur lors du chargement de la liste des tâches"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4335,7 +4358,7 @@ msgstr ""
 "Si vous n'envoyez pas un avis d'annulation, les autres participants ne "
 "seront pas nécessairement informés que la réunion a été annulée."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -4343,7 +4366,7 @@ msgstr ""
 "Si vous n'envoyez pas un avis d'annulation, les autres participants ne "
 "seront pas nécessairement informés que le mémo a été supprimé."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -4351,7 +4374,7 @@ msgstr ""
 "Si vous n'envoyez pas un avis d'annulation, les autres participants ne "
 "seront pas nécessairement informés que la tâche a été supprimée."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4359,7 +4382,7 @@ msgstr ""
 "L'envoi d'informations à jour permet aux autres participants de maintenir à "
 "jour leurs calendriers."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4367,7 +4390,7 @@ msgstr ""
 "L'envoi d'informations à jour permet aux autres participants de maintenir à "
 "jour leurs listes de tâches."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4375,7 +4398,7 @@ msgstr ""
 "Des pièces jointes ont été téléchargées mais l'enregistrement du rendez-vous "
 "sera effectué, sans les pièces jointes, auxquelles il est associé."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4383,89 +4406,89 @@ msgstr ""
 "Des pièces jointes ont été téléchargées mais l'enregistrement de la tâche "
 "sera effectué, sans les pièces jointes, auxquelles elle est associée."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Certaines fonctionnalités peuvent ne pas fonctionner correctement avec la "
 "version actuelle de votre serveur."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Le calendrier d'Evolution a quitté de façon inattendue."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Le memo d'Evolution a quitté de façon inattendue."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Le gestionnaire de tâches d'Evolution a quitté de façon inattendue."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "Le calendrier n'est pas marqué pour une utilisation hors ligne."
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "The memo list is not marked for offline usage"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The memo list is not marked for offline usage."
 msgstr "La liste des mémos n'est pas marquée pour une utilisation hors ligne."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
 msgstr "La liste des tâches n'est pas marquée pour une utilisation hors ligne."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "Ce calendrier sera définitivement supprimé."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "Cette liste des mémos sera définitivement supprimée."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "Cette liste des tâches sera définitivement supprimée."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Voulez-vous enregistrer les modifications apportées à ce rendez-vous ?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "Voulez-vous enregistrer les modifications apportées à ce mémo ?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "Voulez-vous enregistrer les modifications apportées à cette tâche ?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Voulez-vous envoyer un avis d'annulation pour ce mémo ?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Voulez-vous envoyer un avis d'annulation à tous les participants ?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Voulez-vous envoyer des invitations pour la réunion aux participants ?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "Voulez-vous envoyer cette tâche aux participants ?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 "Voulez-vous envoyer des informations mises à jour sur la réunion aux "
 "participants ?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 "Voulez-vous envoyer des informations mises à jour sur la tâche aux "
 "participants ?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4476,114 +4499,113 @@ msgstr ""
 "meilleurs résultats, il est recommandé de mettre à niveau votre serveur vers "
 "une version prise en charge."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Les modifications de ce rendez-vous n'ont pas encore été enregistrées."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "Les modifications de cette tâche n'ont pas encore été enregistrées."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Les modifications de ce mémo n'ont pas encore été enregistrées."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Vos calendriers ne seront pas disponibles tant que Evolution n'aura pas été "
 "redémarré."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Vos mémos ne seront pas disponibles tant que Evolution n'aura pas été "
 "redémarré."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Vos tâches ne seront pas disponibles tant que Evolution n'aura pas été "
 "redémarré."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:75
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "A_bandonner les modifications"
 
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "_Enregistrer les modifications"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:78
 #: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "_Envoyer un avis"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Partager les événements sur plusieurs jours :"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "Impossible de démarrer evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "Impossible de lire les données de l'application « Calendrier » du pilot."
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "Impossible de lire les données de l'application « Mémo » du pilot."
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "Impossible d'écrire les données de l'application « Mémo » du pilot."
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Priorité par défaut :"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "Impossible de lire les données de l'application « À faire » du pilot."
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "Impossible d'écrire les données de l'application « À faire » du pilot."
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "Calendrier et tâches"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:1403
 msgid "Calendars"
 msgstr "Calendriers"
 
@@ -4626,25 +4648,25 @@ msgid "Memo_s"
 msgstr "Mémo_s"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1152
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
+#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "Mémos"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1442
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
+#: ../calendar/gui/e-calendar-table.c:696 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
+#: ../calendar/gui/tasks-component.c:540
+#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/importers/icalendar-importer.c:74
+#: ../calendar/importers/icalendar-importer.c:735
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tâches"
@@ -4662,25 +4684,25 @@ msgstr "_Tâches"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Service de notification d'alarme du calendrier d'Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:402
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "heure"
 msgstr[1] "heures"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "Heure de début"
 
@@ -4691,10 +4713,10 @@ msgstr "Rendez-vous"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
-#: ../plugins/itip-formatter/itip-view.c:1004
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/e-itip-control.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1002
 msgid "Location:"
 msgstr "Lieu :"
 
@@ -4703,17 +4725,15 @@ msgid "Snooze _time:"
 msgstr "_Durée du report :"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:52
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:41
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "É_dition"
 
@@ -4725,32 +4745,32 @@ msgstr "_Reporter"
 msgid "location of appointment"
 msgstr "lieu du rendez-vous"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
 msgid "No summary available."
 msgstr "Aucun résumé disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
 msgid "No description available."
 msgstr "Aucune description disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
 msgid "No location information available."
 msgstr "Aucune information sur le lieu."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
 #, c-format
 msgid "You have %d alarms"
 msgstr "%d alarmes sont présentes"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1677
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1705
+#: ../mail/mail-component.c:1585
 msgid "Warning"
 msgstr "Avertissement"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1681
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4763,7 +4783,7 @@ msgstr ""
 "un courriel. Evolution affichera une fenêtre\n"
 "d'avertissement classique à la place."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4780,15 +4800,15 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment lancer ce programme ?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
 msgid "Do not ask me about this program again."
 msgstr "Ne plus m'interroger à propos de ce programme."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "Impossible d'initialiser Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4801,7 +4821,7 @@ msgid "invalid time"
 msgstr "Heure non valide"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4810,7 +4830,7 @@ msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4821,7 +4841,7 @@ msgstr[1] "%d minutes"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
@@ -5081,12 +5101,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Afficher le champ état dans l'éditeur d'événement/tâche/réunion"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show the \"Preview\" pane"
 msgstr "Afficher le panneau « Aperçu »"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show the \"Preview\" pane."
 msgstr "Afficher le panneau « Aperçu »."
 
@@ -5298,66 +5318,66 @@ msgstr "Minute à laquelle les jours ouvrés commencent"
 msgid "daylight savings time"
 msgstr "ajustement de l'heure d'été"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Summary contains"
 msgstr "Le résumé contient"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Description contains"
 msgstr "La description contient"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Category is"
 msgstr "La catégorie est"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Comment contains"
 msgstr "Le commentaire contient"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Location contains"
 msgstr "L'emplacement contient"
 
-#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
-#: ../calendar/gui/cal-search-bar.c:685
+#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
+#: ../calendar/gui/cal-search-bar.c:684
 msgid "Unmatched"
 msgstr "Différent"
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:630
 msgid "Next 7 Days' Tasks"
 msgstr "Tâches des 7 prochains jours"
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:634
 msgid "Active Tasks"
 msgstr "Tâches actuelles"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:638
 msgid "Overdue Tasks"
 msgstr "Tâches en retard"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:642
 msgid "Completed Tasks"
 msgstr "Tâches terminées"
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:646
 msgid "Tasks with Attachments"
 msgstr "Tâches avec des pièces jointes"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:692
 msgid "Active Appointments"
 msgstr "Rendez-vous actuels"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:696
 msgid "Next 7 Days' Appointments"
 msgstr "Rendez-vous des 7 prochains jours"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimer"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5367,16 +5387,16 @@ msgstr ""
 "que la date sélectionnée. Si vous continuez, vous ne pourrez plus récupérer "
 "ces événements."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Nettoyer les événements plus vieux que"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:397
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../plugins/google-account-setup/google-source.c:403
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "jours"
 
@@ -5384,107 +5404,107 @@ msgstr "jours"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:512
-#: ../calendar/gui/migration.c:610 ../calendar/gui/migration.c:1123
-#: ../calendar/gui/tasks-component.c:231
+#: ../calendar/gui/calendar-component.c:274
+#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
+#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
+#: ../calendar/gui/tasks-component.c:232
 msgid "On The Web"
 msgstr "Sur le Web"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Anniversaires"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Météo"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:616
 msgid "_New Calendar"
 msgstr "_Nouveau calendrier"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2085
+#: ../calendar/gui/calendar-component.c:617
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2090
 msgid "_Copy..."
 msgstr "_Copier..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2099
+#: ../calendar/gui/calendar-component.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2104
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Propriétés"
 
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:950
 msgid "Failed upgrading calendars."
 msgstr "Échec de la mise à jour des calendriers."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1249
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Impossible d'ouvrir le calendrier « %s » pour créer des événements et des "
 "réunions"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1265
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 "Il n'y a pas de calendrier disponible pour créer des événements et des "
 "réunions"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1378
 msgid "Calendar Source Selector"
 msgstr "Sélecteur de source de calendrier"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Nouveau rendez-vous"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
 msgid "_Appointment"
 msgstr "_Rendez-vous"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Crée un nouveau rendez-vous"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Nouvelle réunion"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
 msgid "M_eeting"
 msgstr "_Réunion"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Crée une nouvelle demande de réunion"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Nouveau rendez-vous toute la journée"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
 msgid "All Day A_ppointment"
 msgstr "Rendez-vous toute la _journée"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Crée un nouveau rendez-vous toute la journée"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Nouveau calendrier"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Cale_ndar"
 msgstr "_Calendrier"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Crée un nouveau calendrier"
 
@@ -5505,15 +5525,219 @@ msgid "Month View"
 msgstr "Vue mensuelle"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "N'importe quel champ"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Pièces jointes"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Participant"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "Travail"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Catégorie"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Classification"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "Compétition"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:539
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Confidentiel"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Description"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "La description contient"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "N'existe pas"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Existe"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Favoris"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "Cadeaux"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "Buts/Objectifs"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Vacances"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "Cartes de vacances"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "Contacts importants"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Idées"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "International"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "Client clé"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "Divers"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Prochains 7 jours"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "Organisateur"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "Appels téléphoniques"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:538
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "Privé"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:537 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "Public"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:298
+msgid "Recurrence"
+msgstr "Récurrence"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "État"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Stratégies"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40 ../mail/mail-dialogs.glade.h:20
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "Résumé"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Le résumé contient"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "Fournisseurs"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "Charges horaires"
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "VIP"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "En attente"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "contient"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "ne contient pas"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "est"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "n'est pas"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Erreur lors de l'ouverture du calendrier"
@@ -5526,11 +5750,11 @@ msgstr "Méthode non prise en charge pour l'ouverture du calendrier"
 msgid "Permission denied to open the calendar"
 msgstr "Vous n'avez pas les droits suffisants pour ouvrir le calendrier."
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "Éditer l'alarme"
 
@@ -5563,17 +5787,17 @@ msgid "Mes_sage:"
 msgstr "_Message :"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "Jouer un son"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "Afficher une alerte"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "Lancer un programme"
 
@@ -5586,7 +5810,7 @@ msgid "Send To:"
 msgstr "Envoyer à :"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "Envoyer un courriel"
 
@@ -5634,6 +5858,7 @@ msgid "hour(s)"
 msgstr "heure(s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:242
 msgid "minute(s)"
 msgstr "minute(s)"
 
@@ -5641,7 +5866,7 @@ msgstr "minute(s)"
 msgid "start of appointment"
 msgstr "Début du rendez-vous"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
 msgid "Action/Trigger"
 msgstr "Action/Activation"
 
@@ -5652,16 +5877,15 @@ msgstr "A_jouter"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-msg-composer-select-file.c:93
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggérer l'affichage automatique de la pièce jointe"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
 msgid "Attach file(s)"
 msgstr "Joindre des fichiers"
 
@@ -5731,8 +5955,8 @@ msgid "Display"
 msgstr "Affichage"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Vendredi"
 
@@ -5747,8 +5971,8 @@ msgstr ""
 "Jours"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Lundi"
 
@@ -5771,7 +5995,7 @@ msgstr ""
 "Dimanche"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:112
 msgid "Pick a color"
 msgstr "Choisissez une couleur"
 
@@ -5781,8 +6005,8 @@ msgid "S_un"
 msgstr "_Dim"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Samedi"
 
@@ -5799,8 +6023,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Afficher les _numéros de semaine dans le navigateur de dates"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Dimanche"
 
@@ -5818,8 +6042,8 @@ msgid "Template:"
 msgstr "Modèle :"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Jeudi"
 
@@ -5833,14 +6057,14 @@ msgid "Time format:"
 msgstr "Format de date :"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Mardi"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Mercredi"
 
@@ -5920,320 +6144,471 @@ msgstr "M_er"
 msgid "before every appointment"
 msgstr "avant chaque rendez-vous"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:269
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 "_Copier localement le contenu du calendrier pour les opérations hors ligne"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "_Copier localement le contenu de la liste des tâches pour les opérations "
 "hors ligne"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "_Copier localement le contenu de la liste des mémos pour les opérations hors "
 "ligne"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
-msgstr "C_ouleur :"
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+msgid "Colo_r:"
+msgstr "Couleu_r :"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Task List"
 msgstr "Liste des tâches"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:389
 msgid "Memo List"
 msgstr "Liste des mémos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "Calendar Properties"
 msgstr "Propriétés du calendrier"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "New Calendar"
 msgstr "Nouveau calendrier"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "Task List Properties"
 msgstr "Propriétés de la liste des tâches"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:530
+msgid "New Task List"
+msgstr "Nouvelle liste de tâches"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
+msgid "Memo List Properties"
+msgstr "Propriétés de la liste des mémos"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "New Memo List"
-msgstr "Nouvelle liste des mémos"
+msgstr "Nouvelle liste de mémos"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Cet événement a été supprimé."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Cette tâche a été supprimée."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:66
 msgid "This memo has been deleted."
 msgstr "Ce mémo a été supprimé."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Vous avez effectué des modifications. Voulez-vous les annuler et fermer "
 "l'éditeur ?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 "%s  Vous n'avez effectué aucune modification. Voulez-vous fermer l'éditeur ?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Cet événement a été modifié."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Cette tâche a été modifiée."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:90
 msgid "This memo has been changed."
 msgstr "Ce mémo a été modifié."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Vous avez effectué des modifications. Voulez-vous les annuler et mettre "
 "à jour l'éditeur ?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 "%s  Vous n'avez effectué aucune modification. Voulez-vous mettre à jour "
 "l'éditeur ?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Erreur de validation : %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2340
 msgid " to "
 msgstr " À "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2344
 msgid " (Completed "
 msgstr " (terminé "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2346
 msgid "Completed "
 msgstr "Terminé "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2351
 msgid " (Due "
 msgstr " (date d'échéance "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2353
 msgid "Due "
 msgstr "Date d'échéance "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "Message joint - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3037
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
+#: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Message joint"
 msgstr[1] "%d messages joints"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
 #: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "_Déplacer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "Annuler le _déplacement"
 
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "pièce jointe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "Impossible de mettre à jour l'objet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "Éditer le rendez-vous"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "Réunion - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "Rendez-vous - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tâche attribuée - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "Tâche - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "Mémo - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "Aucun résumé"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "Cliquez ici pour fermer la fenêtre actuelle"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "Copie le texte sélectionné dans le presse-papiers"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "Coupe le texte sélectionné vers le presse-papiers"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "Cliquez ici pour voir l'aide disponible"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "Colle le texte depuis le presse-papiers"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "Cliquez ici pour enregistrer la fenêtre actuelle"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "Sélectionne tout le texte"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "C_lassification"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
+msgid "_File"
+msgstr "_Fichier"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:45
+msgid "_Help"
+msgstr "Aid_e"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "I_nsertion"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "_Options"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2082
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:54
+msgid "_View"
+msgstr "_Affichage"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_Pièce jointe..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "Cliquez ici pour joindre un fichier"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "_Catégories"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "L'état indique si les catégories sont affichées"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "Fu_seau horaire"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "L'état indique si le champ Fuseau horaire est affiché"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "Pu_blic"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "Classer comme public"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "_Privé"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "Classer comme privé"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "_Confidentiel"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "Classer comme confidentiel"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "Champ _Rôle"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "L'état indique si le champ Rôle est affiché"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "L'état indique si le champ RSVP est affiché"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "Champ _État"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "L'état indique si le champ État est affiché"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "Champ _Type"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "L'état indique si le champ Type de participant est affiché"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "Docu_ments récents"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "Joindre"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> pièce jointe"
 msgstr[1] "<b>%d</b> pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "Masquer la _barre des pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "Afficher la _barre des pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3630
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Enlever"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
-#: ../composer/e-msg-composer.c:3633
+#: ../calendar/gui/dialogs/comp-editor.c:2036
+#: ../composer/e-msg-composer.c:1049
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "A_jouter une pièce jointe..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../mail/em-format-html-display.c:2196
 msgid "Show Attachments"
 msgstr "Afficher les pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "Appuyez sur la barre espace pour basculer la barre des pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-msgid "Edit Appointment"
-msgstr "Éditer le rendez-vous"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-#, c-format
-msgid "Meeting - %s"
-msgstr "Réunion - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
-#, c-format
-msgid "Appointment - %s"
-msgstr "Rendez-vous - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Tâche attribuée - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Task - %s"
-msgstr "Tâche - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
-#, c-format
-msgid "Memo - %s"
-msgstr "Mémo - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
-msgid "No summary"
-msgstr "Aucun résumé"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Les modifications effectuées sur cet élément peuvent être annulées en cas de "
 "réception d'une mise à jour"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "Impossible d'utiliser la version actuelle !"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "Impossible d'ouvrir la source"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "Impossible d'ouvrir la destination"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "La destination est en lecture seule"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:202
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "_Supprimer cet élément de toutes les autres boîtes à lettres des "
 "destinataires ?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:53
 msgid "The event could not be deleted due to a corba error"
 msgstr "Impossible de supprimer l'événement à cause d'une erreur CORBA."
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The task could not be deleted due to a corba error"
 msgstr "Impossible de supprimer la tâche à cause d'une erreur CORBA."
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Impossible de supprimer le mémo à cause d'une erreur CORBA."
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:62
 msgid "The item could not be deleted due to a corba error"
 msgstr "Impossible de supprimer l'élément à cause d'une erreur CORBA."
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:69
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 "Impossible de supprimer l'événement à cause de permissions insuffisantes."
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The task could not be deleted because permission was denied"
 msgstr "Impossible de supprimer la tâche à cause de permissions insuffisantes."
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Impossible de supprimer le mémo à cause de permissions insuffisantes."
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 "Impossible de supprimer l'élément à cause de permissions insuffisantes."
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:85
 msgid "The event could not be deleted due to an error"
 msgstr "Impossible de supprimer l'événement à cause d'une erreur."
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:88
 msgid "The task could not be deleted due to an error"
 msgstr "Impossible de supprimer la tâche à cause d'une erreur."
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:91
 msgid "The memo could not be deleted due to an error"
 msgstr "Impossible de supprimer le mémo à cause d'une erreur."
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:94
 msgid "The item could not be deleted due to an error"
 msgstr "Impossible de supprimer l'élément à cause d'une erreur."
 
@@ -6242,7 +6617,7 @@ msgid "Contacts..."
 msgstr "Contacts..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To:"
 msgstr "Déléguer à :"
 
@@ -6250,135 +6625,182 @@ msgstr "Déléguer à :"
 msgid "Enter Delegate"
 msgstr "Saisissez un délégué"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "_Alarmes"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr "Cliquez ici pour définir ou annuler les alarmes de cet événement"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "_Récurrence"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "Transforme en événement récurrent"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Options d'envoi"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "Insère les options avancées d'envoi"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "Toute la _journée"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "L'état indique si défini comme « Événement toute la journée »"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "Afficher la période comme _occupée"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "L'état indique si la période est affichée comme occupée"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "_Libre/Occupé"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr ""
+"Interroge les personnes attendues sur leur disponibilité (libre/occupé)"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "_Rendez-vous"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Récurrence"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "Cet événement possède des alarmes"
 
-#: ../calendar/gui/dialogs/event-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisateur :"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "_Délégués"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "Participa_nts"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "Événement sans date de début"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "Événement sans date de fin"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "La date de début est erronée."
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "La date de fin est erronée."
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "L'heure de début est erronée."
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "L'heure de fin est erronée."
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "L'organisateur sélectionné n'a plus de compte."
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Un organisateur est nécessaire."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Au moins un participant est nécessaire."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Ajouter "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Impossible d'ouvrir le calendrier « %s »."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Vous intervenez pour le compte de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d jour avant le rendez-vous"
 msgstr[1] "%d jours avant le rendez-vous"
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d heure avant le rendez-vous"
 msgstr[1] "%d heures avant le rendez-vous"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minute avant le rendez-vous"
 msgstr[1] "%d minutes avant le rendez-vous"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "Personnaliser"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:943
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../plugins/itip-formatter/itip-formatter.c:2022
+#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-signature-combo-box.c:69
 msgid "None"
 msgstr "Aucune"
 
@@ -6450,28 +6872,24 @@ msgstr "_Changer l'organisateur"
 msgid "Co_ntacts..."
 msgstr "Co_ntacts..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Organisateur"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organisateur :"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2448
 msgid "Memo"
 msgstr "Mémo"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Impossible d'ouvrir les mémos dans « %s »."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
-#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "À"
 
@@ -6489,65 +6907,65 @@ msgid "_Description:"
 msgstr "_Description :"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Groupe :"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 "Vous modifiez actuellement un événement récurrent. Que souhaitez-vous "
 "modifier ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 "Vous déléguez actuellement un événement récurrent. Que souhaitez-vous "
 "déléguer ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 "Vous modifiez actuellement une tâche récurrente. Que souhaitez-vous "
 "modifier ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 "Vous modifiez actuellement un mémo récurrent. Que souhaitez-vous modifier ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "Seulement cette occurrence"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "Cette occurrence et les précédentes"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "Cette instance et celles à venir"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "Toutes les occurrences"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ce rendez-vous contient des récurrences qu'Evolution ne peut éditer."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "La date de la récurrence est non valide"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "le"
 
@@ -6555,7 +6973,7 @@ msgstr "le"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "première"
 
@@ -6564,7 +6982,7 @@ msgstr "première"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "seconde"
 
@@ -6572,7 +6990,7 @@ msgstr "seconde"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "troisième"
 
@@ -6580,7 +6998,7 @@ msgstr "troisième"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "quatrième"
 
@@ -6588,13 +7006,13 @@ msgstr "quatrième"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "dernier"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Autre date"
 
@@ -6602,7 +7020,7 @@ msgstr "Autre date"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1er au 10"
 
@@ -6610,7 +7028,7 @@ msgstr "1er au 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11 au 20"
 
@@ -6618,47 +7036,47 @@ msgstr "11 au 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "21 au 31"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "jour"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "le"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "occurrences"
 
 # pas certain de la traduction. ça peut être aussi exclusion ...
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Ajouter une exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Impossible d'obtenir une sélection à modifier."
 
 # idem add exception
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Modifier l'exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Impossible d'obtenir une sélection à détruire."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Date/Heure"
 
@@ -6709,12 +7127,12 @@ msgstr "semaine(s)"
 msgid "year(s)"
 msgstr "année(s)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "La date d'achèvement est erronée."
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "Page Web"
 
@@ -6729,51 +7147,55 @@ msgstr "<span weight=\"bold\">État</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:634 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/print.c:2520 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "Achevée"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:559 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Haute"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:633 ../calendar/gui/print.c:2517
 msgid "In Progress"
 msgstr "En cours"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:561 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Basse"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:560
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normale"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:632 ../calendar/gui/print.c:2514
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Non démarrée"
 
@@ -6786,7 +7208,7 @@ msgid "Stat_us:"
 msgstr "É_tat :"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:562 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Indéfinie"
 
@@ -6795,7 +7217,7 @@ msgid "_Date completed:"
 msgstr "_Date d'achèvement :"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "_Priorité :"
 
@@ -6803,25 +7225,38 @@ msgstr "_Priorité :"
 msgid "_Web Page:"
 msgstr "Page _Web :"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "Détails de l'é_tat"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+msgid "Click to change or view the status details of the task"
+msgstr "Cliquer pour modifier ou afficher les détails de l'état de la tâche"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "Options d'_envoi"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/tasks-component.c:1326
 msgid "_Task"
 msgstr "_Tâche"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Détails de la tâche"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_sateur :"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "La date d'échéance est erronée"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Impossible d'ouvrir les tâches dans « %s »."
@@ -6847,7 +7282,7 @@ msgid "_Due date:"
 msgstr "_Date d'échéance :"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6855,142 +7290,126 @@ msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semaine"
 msgstr[1] "%d semaines"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "Action inconnue à exécuter"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s avant le début du rendez-vous"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s après le début du rendez-vous"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s au début du rendez-vous"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s avant la fin du rendez-vous"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s après la fin du rendez-vous"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s à la fin du rendez-vous"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s at %s"
 msgstr "%s à %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s pour un type d'activation inconnu"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliquez pour ouvrir %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:160
-#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
-#: ../shell/e-shell-folder-title-bar.c:593
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:856
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:212
-#: ../calendar/gui/e-cal-component-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
 msgstr "Date de début :"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:225
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-itip-control.c:1201
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-itip-control.c:1218
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Description :"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:261
-#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "Page Web :"
 
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-cal-component-preview.c:210
+#: ../calendar/gui/e-itip-control.c:1162
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Résumé :"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Date d'échéance :"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:1029
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
+#: ../plugins/itip-formatter/itip-view.c:1027
 msgid "Status:"
 msgstr "État :"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Priorité :"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Public"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Privé"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Confidentiel"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Date de fin"
@@ -7000,21 +7419,14 @@ msgstr "Date de fin"
 msgid "Start Date"
 msgstr "Date de début"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "Summary"
-msgstr "Résumé"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Occupé"
 
@@ -7029,34 +7441,34 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:746
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Oui"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:165
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Non"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
+#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
+#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2046
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -7068,159 +7480,185 @@ msgstr "Récurrent"
 msgid "Assigned"
 msgstr "Attribué"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2030
 msgid "Select folder to save selected attachments..."
 msgstr "Choisir le dossier où enregistrer les pièces jointes sélectionnées..."
 
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
 #, c-format
 msgid "untitled_image.%s"
 msgstr "image_sansnom.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1568
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
+#: ../mail/em-popup.c:574
 msgid "Set as _Background"
 msgstr "Définir comme _arrière-plan"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "_Enregistrer la sélection"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
 #, c-format
 msgid "Open in %s..."
 msgstr "Ouvrir dans %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:330
+msgid "* No Summary *"
+msgstr "* Aucun résumé *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organisateur : %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:369
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organisateur : %s"
+
+#: ../calendar/gui/e-calendar-table.c:400
+msgid "Start: "
+msgstr "Début : "
+
+#: ../calendar/gui/e-calendar-table.c:412
+msgid "Due: "
+msgstr "Échéance : "
+
+#: ../calendar/gui/e-calendar-table.c:581
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:582
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:583
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:584
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:585
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:586
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:587
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:588
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:871
+#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Supprimer les objets sélectionnés"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:807 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1155
+#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Mise à jour des objets"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1233 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-msg-composer.c:1472
+#: ../calendar/gui/e-calendar-table.c:1340
+#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-table.c:1563
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "Nouvelle _tâche"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1567 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Ouvrir le _site Web"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1669 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1569
+#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "_Imprimer..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1689 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1573
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_uper"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1575
+#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "C_oller"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1579 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Attribuer une tâche"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1580 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Faire suivre comme iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1581
 msgid "_Mark as Complete"
 msgstr "_Marquer comme terminé"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1582
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marquer les tâches sélectionnées comme terminées"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1583
 msgid "_Mark as Incomplete"
 msgstr "_Marquer comme incomplet"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1584
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marquer les tâches sélectionnées comme incomplètes"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Delete Selected Tasks"
 msgstr "_Supprimer les tâches sélectionnées"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1826
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Cliquez ici pour ajouter une tâche"
@@ -7243,7 +7681,8 @@ msgid "Due date"
 msgstr "Date d'échéance"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "Priorité"
 
@@ -7251,112 +7690,93 @@ msgstr "Priorité"
 msgid "Start date"
 msgstr "Date de début"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "État"
-
-#: ../calendar/gui/e-calendar-view.c:1352
+#: ../calendar/gui/e-calendar-view.c:1349
 msgid "Moving items"
 msgstr "Déplacement d'éléments"
 
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1351
 msgid "Copying items"
 msgstr "Copie d'éléments"
 
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New _Appointment..."
 msgstr "Nouveau re_ndez-vous..."
 
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1661
 msgid "New All Day _Event"
 msgstr "Nouvel évén_ement toute la journée"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1662
 msgid "New _Meeting"
 msgstr "Nouvelle _réunion"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "_Current View"
 msgstr "Vue a_ctive"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1675
 msgid "Select T_oday"
 msgstr "Sélectionner au_jourd'hui"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1676
 msgid "_Select Date..."
 msgstr "_Sélectionner une date..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Pri_nt..."
 msgstr "_Imprimer..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "Cop_y to Calendar..."
 msgstr "Copier vers le c_alendrier..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Mo_ve to Calendar..."
 msgstr "Déplacer _vers le calendrier..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Delegate Meeting..."
 msgstr "Déléguer une _réunion..."
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "_Schedule Meeting..."
 msgstr "Planifier une _réunion..."
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "_Forward as iCalendar..."
 msgstr "_Faire suivre comme iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1697
 msgid "_Reply"
 msgstr "_Répondre"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
+#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Répondre à _tous"
 
-#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-calendar-view.c:1703
 msgid "Make this Occurrence _Movable"
 msgstr "Rendre cette occurrence _déplaçable"
 
-#: ../calendar/gui/e-calendar-view.c:1707 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Supprimer cette _occurrence"
 
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1705
 msgid "Delete _All Occurrences"
 msgstr "Supprimer _toutes les occurrences"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2208
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organisateur : %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2212
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organisateur : %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2477
 #, c-format
 msgid "Location: %s"
 msgstr "Lieu : %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "Heure : %s %s"
@@ -7384,7 +7804,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:807
+#: ../calendar/gui/e-day-view-time-item.c:589
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisions par minute"
@@ -7395,46 +7815,34 @@ msgstr "%02i divisions par minute"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1359
-#: ../calendar/gui/e-day-view.c:2145
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-day-view.c:1123
-#: ../calendar/gui/e-week-view.c:511 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
+#: ../calendar/gui/print.c:813
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:773 ../calendar/gui/e-day-view.c:1126
-#: ../calendar/gui/e-week-view.c:514 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
+#: ../calendar/gui/print.c:815
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Oui. (Récurrence complexe)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Tous les jours"
 msgstr[1] "Tous les %d jours"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
@@ -7442,9 +7850,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "Toutes les semaines"
 msgstr[1] "Toutes les %d semaines"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7452,51 +7858,35 @@ msgstr[0] "Toutes les semaines le "
 msgstr[1] "Toutes les %d semaines le "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " et "
 
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "Le %s jour de "
 
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "Le %s %s de "
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "tous les mois"
 msgstr[1] "tous les %d mois"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Tous les ans"
 msgstr[1] "Tous les %d ans"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7504,47 +7894,47 @@ msgstr[0] " un total de %d fois"
 msgstr[1] " un total de %d fois"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", finissant le "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Débuts"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "Fins"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "Échéance"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "Information iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "Erreur iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
-#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:521
+#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "Une personne inconnue"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1126
+#: ../calendar/gui/e-itip-control.c:1143
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7552,28 +7942,28 @@ msgstr ""
 "<br> Vérifiez les informations suivantes puis sélectionner une action du "
 "menu ci-dessous."
 
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/itip-utils.c:728
-#: ../plugins/itip-formatter/itip-formatter.c:2034
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/itip-utils.c:664
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "Accepté"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "Accepté provisoirement"
 
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
-#: ../plugins/itip-formatter/itip-formatter.c:2040
+#: ../calendar/gui/e-itip-control.c:1199
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "Refusé"
 
-#: ../calendar/gui/e-itip-control.c:1266
+#: ../calendar/gui/e-itip-control.c:1283
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
@@ -7581,267 +7971,267 @@ msgstr ""
 "La réunion a été annulée mais elle ne peut pas être trouvée dans vos "
 "calendriers"
 
-#: ../calendar/gui/e-itip-control.c:1268
+#: ../calendar/gui/e-itip-control.c:1285
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "La tâche a été annulée mais elle ne peut pas être trouvée dans vos listes de "
 "tâches"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> a publié les informations de la réunion."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Informations de la réunion"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1370
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> demande la présence de %s à ce rendez-vous."
 
-#: ../calendar/gui/e-itip-control.c:1355
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> demande votre présence à cette réunion."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Proposition de réunion"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> souhaite être intégré à une réunion existante."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Mise à jour de la réunion"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> souhaite recevoir les informations de la dernière réunion."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Demande de mise à jour de la réunion"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> a répondu à une demande de réunion."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Réponse à une réunion"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> a annulé une réunion."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Annulation de réunion"
 
-#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1528
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> a envoyé un message incompréhensible."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Message de réunion incorrect"
 
-#: ../calendar/gui/e-itip-control.c:1422
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> a publié les informations de la tâche."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Informations de la tâche"
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1447
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> demande à %s d'exécuter une tâche."
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> vous demande d'exécuter une tâche."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Tâche proposée"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> souhaite être intégré à une tâche existante."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Mise à jour de tâche"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> souhaite recevoir les informations de la dernière tâche."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Demande de mise à jour de tâche"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> a répondu à une attribution de tâche."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Réponse à une tâche"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> a annulé une tâche."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "Annulation de tâche"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Message de tâche incorrect"
 
-#: ../calendar/gui/e-itip-control.c:1496
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> a publié une information Libre/Occupé."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Information Libre/Occupé"
 
-#: ../calendar/gui/e-itip-control.c:1501
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> demande votre information Libre/Occupé."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Demande Libre/Occupé"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> a répondu à une demande Libre/Occupé."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Réponse Libre/Occupé"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Message Libre/Occupé incorrect"
 
-#: ../calendar/gui/e-itip-control.c:1588
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message does not appear to be properly formed"
 msgstr "Le message ne semble pas être correctement rempli."
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "Le message ne contient que des requêtes non prises en charge."
 
-#: ../calendar/gui/e-itip-control.c:1680
+#: ../calendar/gui/e-itip-control.c:1697
 msgid "The attachment does not contain a valid calendar message"
 msgstr "La pièce jointe ne contient pas d'information de calendrier valide."
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 "La pièce jointe ne contient pas d'information de calendrier visualisable."
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "Mise à jour terminée\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "L'objet n'est pas valide et ne peut pas être mis à jour\n"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Cette réponse ne provient pas d'un participant. L'ajouter comme participant ?"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "L'état du participant n'a pas pu être mis à jour à cause d'un état non "
 "valide !\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "État du participant mis à jour\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1254
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "L'état du participant ne peut pas être mis à jour car l'élément n'existe plus"
 
-#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "Élément envoyé !\n"
 
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "Impossible d'envoyer l'élément !\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Sélectionner une action :"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: ../calendar/gui/e-itip-control.c:2332
+#: ../calendar/gui/e-itip-control.c:2355
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Accepter"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Accepter provisoirement"
 
-#: ../calendar/gui/e-itip-control.c:2334
+#: ../calendar/gui/e-itip-control.c:2357
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Refuser"
 
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Envoyer l'information Libre/Occupé"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Mettre à jour l'état de l'interlocuteur"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Envoyer les dernières informations"
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuler"
@@ -7870,112 +8260,112 @@ msgstr "Chargement du calendrier..."
 msgid "Server Message:"
 msgstr "Message du serveur :"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Présidents"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Participants attendus"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Participants optionnels"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Ressources"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "Participants"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:965
 msgid "Individual"
 msgstr "Individuel"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
 #: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Groupe"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
 #: ../calendar/gui/print.c:967
 msgid "Resource"
 msgstr "Ressource"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
 #: ../calendar/gui/print.c:968
 msgid "Room"
 msgstr "Salle"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
 #: ../calendar/gui/print.c:982
 msgid "Chair"
 msgstr "Président"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/e-meeting-store.c:746 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:983
 msgid "Required Participant"
 msgstr "Participant attendu"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
 #: ../calendar/gui/print.c:984
 msgid "Optional Participant"
 msgstr "Participant optionnel"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
 #: ../calendar/gui/print.c:985
 msgid "Non-Participant"
 msgstr "Non participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:756
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:753
 msgid "Needs Action"
 msgstr "Nécessite une action"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Tentative"
 msgstr "Provisoire"
 
-#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/itip-utils.c:737
-#: ../plugins/itip-formatter/itip-formatter.c:2043
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/itip-utils.c:673
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "Délégué"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:484
+#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr "Participant                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../calendar/gui/e-meeting-list-view.c:533
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
 msgstr "En cours"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:473
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
@@ -7983,85 +8373,81 @@ msgstr "%A %d %B %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:481
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "Absent du bureau"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "Aucune information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "Par_ticipants..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "O_ptions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "Afficher _seulement les heures de travail"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "Afficher Zoom a_rrière"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "_Mettre à jour Libre/Occupé"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "_Choix automatique"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "_Toutes les personnes et ressources"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "Toutes les _personnes et une ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "Personnes atte_ndues"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "Personnes attendues et _une ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "Heure de _début :"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "Heure de _fin :"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Participant"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Cliquez ici pour ajouter un participant"
@@ -8094,8 +8480,8 @@ msgstr "_Supprimer les mémos sélectionnés"
 msgid "Click to add a memo"
 msgstr "Cliquez ici pour ajouter un mémo"
 
-#: ../calendar/gui/e-memos.c:791 ../calendar/gui/e-tasks.c:923
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/gnome-cal.c:2864
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8104,85 +8490,84 @@ msgstr ""
 "Erreur sur %s :\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:840
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "Chargement des mémos"
 
-#: ../calendar/gui/e-memos.c:921
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Ouverture des mémos de %s"
 
-#: ../calendar/gui/e-memos.c:1094 ../calendar/gui/e-tasks.c:1334
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "Suppression des objets sélectionnés..."
 
-#: ../calendar/gui/e-tasks.c:976
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "Chargement des tâches"
 
-#: ../calendar/gui/e-tasks.c:1066
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ouverture des tâches à %s"
 
-#: ../calendar/gui/e-tasks.c:1311
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "Achèvement des tâches..."
 
-#: ../calendar/gui/e-tasks.c:1361
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "Nettoyage"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:130
 msgid "Select Timezone"
 msgstr "Sélectionner un fuseau horaire"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1637
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:828
+#: ../calendar/gui/gnome-cal.c:830
 msgid "Updating query"
 msgstr "Mise à jour de la requête"
 
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2501
 msgid "_Custom View"
 msgstr "Vue _personnalisée"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2502
 msgid "_Save Custom View"
 msgstr "_Enregistrer la vue personnalisée"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2507
 msgid "_Define Views..."
 msgstr "_Définir les vues..."
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2688
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Chargement des rendez-vous à %s"
 
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2707
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Chargement des tâches à %s"
 
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2716
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Chargement des mémos à %s"
 
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2823
 #, c-format
 msgid "Opening %s"
 msgstr "Ouverture de %s"
 
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3779
 msgid "Purging"
 msgstr "Nettoyage"
 
@@ -8242,138 +8627,142 @@ msgstr "Septembre"
 msgid "_Select Today"
 msgstr "_Sélectionner aujourd'hui"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../calendar/gui/itip-utils.c:544
 msgid "An organizer must be set."
 msgstr "Un organisateur doit être défini."
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "Au moins un participant est nécessaire."
 
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "Informations de l'événement"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Informations de la tâche"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "Informations du mémo"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Information Libre/Occupé"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Informations du calendrier"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Actualiser"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Contre-proposition"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Information Libre/Occupé (%s à %s)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "Information iCalendar"
 
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "Vous devez être inscrit comme participant à l'événement."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:465
 msgid "_New Memo List"
 msgstr "_Nouvelle liste des mémos"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:545
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d mémo"
 msgstr[1] "%d mémos"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d sélectionné"
 msgstr[1] ", %d sélectionnés"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:594
 msgid "Failed upgrading memos."
 msgstr "La mise à jour des mémos a échoué."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:954
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Impossible d'ouvrir la liste des mémos « %s » pour créer des événements et "
 "des réunions"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:967
 msgid "There is no calendar available for creating memos"
 msgstr "Il n'y a pas de calendrier disponible pour créer des mémos"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1077
 msgid "Memo Source Selector"
 msgstr "Sélecteur de source de mémos"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Nouveau mémo"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
 msgid "Mem_o"
 msgstr "Mém_o"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Crée un nouveau mémo"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Nouveau mémo partagé"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
 msgid "_Shared memo"
 msgstr "Mémo _partagé"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Crée un nouveau mémo partagé"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Nouvelle liste de mémos"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
 msgid "Memo li_st"
 msgstr "L_iste de mémos"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Crée une nouvelle liste de mémos"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
 msgstr "Imprimer les mémos"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days'"
+msgstr "Prochains 7 jours"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8385,7 +8774,7 @@ msgstr ""
 "\n"
 "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
 
-#: ../calendar/gui/migration.c:168
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8398,7 +8787,7 @@ msgstr ""
 "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:781 ../calendar/gui/migration.c:949
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
@@ -8406,21 +8795,21 @@ msgstr ""
 "xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:810
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Impossible de migrer le calendrier « %s »"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:978
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Impossible de migrer les tâches « %s »"
 
 #: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
 msgid "Notes"
 msgstr "Notes"
 
@@ -8628,69 +9017,69 @@ msgstr "Contacts : "
 msgid "Upcoming Appointments"
 msgstr "Prochains rendez-vous"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:456
 msgid "_New Task List"
 msgstr "_Nouvelle liste de tâches"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:536
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tâche"
 msgstr[1] "%d tâches"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:585
 msgid "Failed upgrading tasks."
 msgstr "La mise à jour des tâches a échoué."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:942
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Impossible d'ouvrir la liste de tâches « %s » pour créer des événements et "
 "des réunions"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:955
 msgid "There is no calendar available for creating tasks"
 msgstr "Il n'y a pas de calendrier disponible pour créer des tâches"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1066
 msgid "Task Source Selector"
 msgstr "Sélecteur de source de tâche"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Nouvelle tâche"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Crée une nouvelle tâche"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Nouvelle tâche attribuée"
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1334
 msgid "Assigne_d Task"
 msgstr "Tâche _attribuée"
 
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Crée une nouvelle tâche attribuée"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Nouvelle liste de tâches"
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1342
 msgid "Tas_k list"
 msgstr "_Liste de tâches"
 
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Crée une nouvelle liste de tâches"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../calendar/gui/tasks-control.c:452
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8702,49 +9091,70 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment effacer les tâches ?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "Ne plus poser la question."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Imprimer les tâches"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% effectué"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Annulé"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "En cours"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "est supérieur à"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "est inférieur à"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Rendez-vous et réunions"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1580
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1578
 msgid "Opening calendar"
 msgstr "Ouverture du calendrier"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "Fichiers iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Assistant d'importation iCalendar d'Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "Rappel !"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "Fichiers vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Assistant d'importation vCalendar d'Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "Événements du calendrier"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Assistant d'importation intelligent du calendrier d'Evolution"
 
@@ -10278,56 +10688,214 @@ msgstr "Pacifique/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacifique/Yap"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "Cliquez ici pour le carnet d'adresses"
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "Impossible d'ouvrir le fichier d'enregistrement automatique"
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "Destination d'envoi"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "Impossible de récupérer le message depuis l'éditeur"
 
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "Choisissez les dossiers auxquels envoyer ce message."
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "Insertion d'une pièce jointe"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "Cliquez ici pour sélectionner les dossiers de destination"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "_Joindre"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "Si_gnature :"
+#: ../composer/e-composer-actions.c:143
+msgid "Untitled Message"
+msgstr "Message sans sujet"
 
-#: ../composer/e-msg-composer-hdrs.c:326
-msgid "Fr_om:"
-msgstr "_De :"
+#: ../composer/e-composer-actions.c:474
+msgid "Attach a file"
+msgstr "Joindre un fichier"
 
-#: ../composer/e-msg-composer-hdrs.c:332
-msgid "_Reply-To:"
-msgstr "_Répondre à :"
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "_Fermer"
 
-#: ../composer/e-msg-composer-hdrs.c:335
-msgid "_To:"
-msgstr "_À :"
+#: ../composer/e-composer-actions.c:481
+msgid "Close the current file"
+msgstr "Ferme le fichier actuel"
+
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "_Imprimer..."
+
+#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "_Aperçu avant impression"
+
+#: ../composer/e-composer-actions.c:502
+msgid "Save the current file"
+msgstr "Enregistre le fichier actuel"
+
+#: ../composer/e-composer-actions.c:507
+msgid "Save _As..."
+msgstr "Enregistrer _sous..."
+
+#: ../composer/e-composer-actions.c:509
+msgid "Save the current file with a different name"
+msgstr "Enregistre le fichier actuel avec un nom différent"
+
+#: ../composer/e-composer-actions.c:514
+msgid "Save _Draft"
+msgstr "Enregistrer le _brouillon"
+
+#: ../composer/e-composer-actions.c:516
+msgid "Save as draft"
+msgstr "Enregistre comme brouillon"
 
-#: ../composer/e-msg-composer-hdrs.c:337
+#: ../composer/e-composer-actions.c:521
+msgid "S_end"
+msgstr "E_nvoyer"
+
+#: ../composer/e-composer-actions.c:523
+msgid "Send this message"
+msgstr "Envoie ce message"
+
+#: ../composer/e-composer-actions.c:530
+msgid "Insert Send options"
+msgstr "Insére les options d'envoi"
+
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "Nouveau _message"
+
+#: ../composer/e-composer-actions.c:537
+msgid "Open New Message window"
+msgstr "Ouvre la fenêtre Nouveau message"
+
+#: ../composer/e-composer-actions.c:544
+msgid "Character _Encoding"
+msgstr "_Codage des caractères"
+
+#: ../composer/e-composer-actions.c:551
+msgid "_Security"
+msgstr "Séc_urité"
+
+#: ../composer/e-composer-actions.c:561
+msgid "PGP _Encrypt"
+msgstr "_Chiffrer avec PGP"
+
+#: ../composer/e-composer-actions.c:563
+msgid "Encrypt this message with PGP"
+msgstr "Chiffre ce message avec PGP"
+
+#: ../composer/e-composer-actions.c:569
+msgid "PGP _Sign"
+msgstr "_Signer avec PGP"
+
+#: ../composer/e-composer-actions.c:571
+msgid "Sign this message with your PGP key"
+msgstr "Signe ce message avec votre clé PGP"
+
+#: ../composer/e-composer-actions.c:577
+msgid "_Prioritize Message"
+msgstr "_Prioriser le message"
+
+#: ../composer/e-composer-actions.c:579
+msgid "Set the message priority to high"
+msgstr "Affecte une priorité élevée au message"
+
+#: ../composer/e-composer-actions.c:585
+msgid "Re_quest Read Receipt"
+msgstr "D_emander un accusé de lecture"
+
+#: ../composer/e-composer-actions.c:587
+msgid "Get delivery notification when your message is read"
+msgstr "Obtenir un avertissement quand votre message est lu"
+
+#: ../composer/e-composer-actions.c:593
+msgid "S/MIME En_crypt"
+msgstr "C_hiffrer avec S/MIME"
+
+#: ../composer/e-composer-actions.c:595
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "Chiffre ce message avec votre certificat de chiffrement S/MIME"
+
+#: ../composer/e-composer-actions.c:601
+msgid "S/MIME Sig_n"
+msgstr "S_igner avec S/MIME"
+
+#: ../composer/e-composer-actions.c:603
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Signe ce message avec votre certificat de signature S/MIME"
+
+#: ../composer/e-composer-actions.c:609
+msgid "_Bcc Field"
+msgstr "Champ Cc_i"
+
+#: ../composer/e-composer-actions.c:611
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Indique si le champ Cci est affiché"
+
+#: ../composer/e-composer-actions.c:617
+msgid "_Cc Field"
+msgstr "Champ _Cc"
+
+#: ../composer/e-composer-actions.c:619
+msgid "Toggles whether the CC field is displayed"
+msgstr "Indique si le champ Cc est affiché"
+
+#: ../composer/e-composer-actions.c:625
+msgid "_From Field"
+msgstr "Champ _De"
+
+#: ../composer/e-composer-actions.c:627
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Indique si le champ De est affiché"
+
+# voir les toggles au dessus !
+#: ../composer/e-composer-actions.c:633
+msgid "_Post-To Field"
+msgstr "Champ En_voyé à"
+
+#: ../composer/e-composer-actions.c:635
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "Indique si le champ Envoyé à est affiché"
+
+#: ../composer/e-composer-actions.c:641
+msgid "_Reply-To Field"
+msgstr "Champ _Répondre à"
+
+#: ../composer/e-composer-actions.c:643
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Indique si le champ Répondre à est affiché"
+
+#: ../composer/e-composer-actions.c:649
+msgid "_Subject Field"
+msgstr "Champ _Sujet"
+
+#: ../composer/e-composer-actions.c:651
+msgid "Toggles whether the Subject field is displayed"
+msgstr "Indique si le champ Sujet est affiché"
+
+#: ../composer/e-composer-actions.c:657
+msgid "_To Field"
+msgstr "Champ _À"
+
+#: ../composer/e-composer-actions.c:659
+msgid "Toggles whether the To field is displayed"
+msgstr "Indique si le champ À est affiché"
+
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Saisissez les destinataires du message"
 
-#: ../composer/e-msg-composer-hdrs.c:340
-msgid "_Cc:"
-msgstr "_Cc :"
-
-#: ../composer/e-msg-composer-hdrs.c:342
+#: ../composer/e-composer-header-table.c:68
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Saisissez les adresses qui recevront une copie carbone de ce message"
 
-#: ../composer/e-msg-composer-hdrs.c:346
-msgid "_Bcc:"
-msgstr "Cc_i :"
-
-#: ../composer/e-msg-composer-hdrs.c:348
+#: ../composer/e-composer-header-table.c:71
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10335,30 +10903,70 @@ msgstr ""
 "Saisissez les adresses qui recevront une copie du message sans apparaître "
 "dans la liste des destinataires du message"
 
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr "_De :"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr "_Répondre à :"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "_À :"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "_Cc :"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "Cc_i :"
+
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "_Poster à :"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "_Sujet :"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "_Joindre"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "Si_gnature :"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "Insertion d'une pièce jointe"
+#: ../composer/e-composer-name-header.c:114
+msgid "Click here for the address book"
+msgstr "Cliquez ici pour le carnet d'adresses"
+
+#: ../composer/e-composer-post-header.c:136
+msgid "Posting destination"
+msgstr "Destination d'envoi"
 
-#: ../composer/e-msg-composer.c:819
+#: ../composer/e-composer-post-header.c:137
+msgid "Choose folders to post the message to."
+msgstr "Choisissez les dossiers auxquels envoyer ce message."
+
+#: ../composer/e-composer-post-header.c:171
+msgid "Click here to select folders to post to"
+msgstr "Cliquez ici pour sélectionner les dossiers de destination"
+
+#: ../composer/e-composer-private.c:65
+msgid "Recent _Documents"
+msgstr "_Documents récents"
+
+#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+msgid "Show _Attachment Bar"
+msgstr "Afficher la barre des pièces _jointes"
+
+#: ../composer/e-msg-composer.c:873
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Impossible de signer le message sortant : aucun certificat de signature "
 "défini pour ce compte"
 
-#: ../composer/e-msg-composer.c:826
+#: ../composer/e-msg-composer.c:880
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10366,42 +10974,23 @@ msgstr ""
 "Impossible de chiffrer le message sortant : aucun certificat de chiffrement "
 "défini pour ce compte"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
+#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1914
+#: ../mail/em-format-html-display.c:2404 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Pièce jointe"
+msgstr[1] "Pièces jointes"
+
+#: ../composer/e-msg-composer.c:1557
 msgid "Hide _Attachment Bar"
 msgstr "Masquer la barre des pièces _jointes"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3878
-msgid "Show _Attachment Bar"
-msgstr "Afficher la barre des pièces _jointes"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "Raison inconnue"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "Impossible d'ouvrir le fichier"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "Impossible de récupérer le message depuis l'éditeur"
-
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
-msgstr "Message sans sujet"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "Ouvrir un fichier"
-
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3758
-#: ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
 msgid "Compose Message"
 msgstr "Rédaction d'un message"
 
-#: ../composer/e-msg-composer.c:5031
+#: ../composer/e-msg-composer.c:4056
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10435,8 +11024,7 @@ msgstr ""
 "À cause de « {0} », il se peut que vous ayez besoin de choisir d'autres "
 "options de messagerie."
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "À cause de « {1} »."
 
@@ -10560,7 +11148,7 @@ msgstr "Vous devez configurer un compte avant de pouvoir rédiger un courriel."
 msgid "_Do not Recover"
 msgstr "_Ne pas récupérer"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:317
+#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:306
 msgid "_Recover"
 msgstr "_Récupérer"
 
@@ -10572,7 +11160,7 @@ msgstr "_Enregistrer le message"
 msgid "Evolution Mail and Calendar"
 msgstr "Messagerie et calendrier d'Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:753
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Suite de travail collaboratif"
 
@@ -10589,51 +11177,74 @@ msgstr "carte de visite"
 msgid "calendar information"
 msgstr "Informations du calendrier"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Erreur d'Evolution"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Avertissement d'Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Information d'Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Requête d'Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Erreur interne, erreur inconnue « %s » demandée"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:154
+msgid "Component"
+msgstr "Composant"
+
+#: ../e-util/e-logger.c:155
+msgid "Name of the component being logged"
+msgstr "Nom du composant en cours de journalisation"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../plugins/plugin-manager/plugin-manager.c:339
+#: ../plugins/publish-calendar/publish-calendar.c:689
+msgid "Enabled"
+msgstr "Activé"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "Indique si le greffon est activé"
+
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "Erreur durant l'impression"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr ""
 "Le système d'impression a rapporté les informations suivantes sur cette "
 "erreur :"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:171
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
 "Le système d'impression n'a pas rapporté d'informations supplémentaires sur "
 "cette erreur."
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "À cause de « {1} »."
+
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
+msgid "Cannot open file \"{0}\"."
 msgstr "Impossible d'ouvrir le fichier « {0} »."
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
+msgid "Cannot save file \"{0}\"."
 msgstr "Impossible d'enregistrer le fichier « {0} »."
 
 #: ../e-util/e-system.error.xml.h:4
@@ -10641,7 +11252,7 @@ msgid "Do you wish to overwrite it?"
 msgstr "Voulez-vous l'écraser ?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
+msgid "File exists \"{0}\"."
 msgstr "Fichier existant « {0} »."
 
 #: ../e-util/e-system.error.xml.h:6
@@ -10652,49 +11263,62 @@ msgstr "Écraser le fichier ?"
 msgid "_Overwrite"
 msgstr "É_craser"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "I_mportant"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "_Bureau"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "_Personnel"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "À _faire"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "Plus _tard"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
-msgstr "_Nom du libellé :"
+msgstr "_Nom de l'étiquette :"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
-msgstr "Modifier le libellé"
+msgstr "Modifier l'étiquette"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
-msgstr "Ajouter un libellé"
+msgstr "Ajouter une étiquette"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
-msgstr "Un nom de libellé ne peut pas être vide."
+msgstr "Un nom d'étiquette ne peut pas être vide."
+
+#: ../e-util/e-util-labels.c:356
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
+msgstr ""
+"Ce nom d'étiquette est déjà utilisé sur ce serveur. Veuillez choisir un "
+"autre nom d'étiquette."
+
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "Erreur GConf : %s"
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
-msgstr "Un libellé avec la même étiquette existe déjà. Renommez votre libellé."
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "Toutes les erreurs futures seront affichées seulement sur le terminal."
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -10812,65 +11436,65 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Sélectionnez une heure pour la comparaison"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Choisissez un fichier"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:851
 msgid "R_ule name:"
 msgstr "Nom de la _règle :"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:879
 msgid "Find items that meet the following criteria"
 msgstr "Chercher les éléments qui correspondent aux critères suivants"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:913
 msgid "A_dd Filter Criteria"
 msgstr "A_jouter un critère au filtre"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:919
 msgid "If all criteria are met"
 msgstr "Si tous les critères sont remplis"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:919
 msgid "If any criteria are met"
 msgstr "Si un des critères est rempli"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:921
 msgid "_Find items:"
 msgstr "_Trouver les éléments :"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "All related"
 msgstr "Tous ceux relatifs"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "Replies"
 msgstr "Réponses"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "Replies and parents"
 msgstr "Réponses et parents"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "No reply or parent"
 msgstr "Pas de réponse ou parent"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:945
 msgid "I_nclude threads"
 msgstr "I_nclure les fils de discussion"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1043 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Entrant"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1043 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Sortant"
 
@@ -10894,7 +11518,7 @@ msgstr "Date manquante."
 msgid "Missing file name."
 msgstr "Nom de fichier manquant."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Nom manquant."
 
@@ -10970,7 +11594,7 @@ msgstr "dans le futur"
 msgid "months"
 msgstr "mois"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "secondes"
 
@@ -10982,9 +11606,9 @@ msgstr "la date actuelle"
 msgid "the time you specify"
 msgstr "une date que vous spécifiez"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:404
 msgid "weeks"
 msgstr "semaines"
 
@@ -11000,7 +11624,7 @@ msgstr "Ajouter une règle"
 msgid "Edit Rule"
 msgstr "Éditer la règle"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Nom de la règle"
 
@@ -11026,57 +11650,69 @@ msgid "Configure your email accounts here"
 msgstr "Configurez ici vos comptes de messagerie."
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "Configurez ici les paramètres de votre connexion réseau"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Messagerie d'Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr "Composant de configuration des comptes de messagerie d'Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Composant Messagerie d'Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Éditeur de courriel d'Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr "Configuration de l'éditeur de courriel d'Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "Préférences de la messagerie d'Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:575 ../mail/mail-component.c:576
-#: ../mail/mail-component.c:740
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Network configuration control"
+msgstr "Configuration réseau d'Evolution"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../mail/mail-component.c:593 ../mail/mail-component.c:594
+#: ../mail/mail-component.c:758
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Courriel"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:502
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "Comptes de messagerie"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:102
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "Préférences du courriel"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "Préférences réseau"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "_Courriel"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "Accord de licence %s"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -11089,116 +11725,110 @@ msgstr ""
 "affiché ci-dessous pour « %s »\n"
 "et cochez la case pour l'accepter\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "Sélectionnez un dossier"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:97
 msgid "Autogenerated"
 msgstr "Générée automatiquement"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "Demander à chaque message"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identité"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:123
 msgid "Receiving Email"
 msgstr "Réception du courriel"
 
 # Toutes les n minutes (Stéphane)
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2041
 msgid "Check for _new messages every"
 msgstr "Vérifier les _nouveaux messages toutes les"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2049
 msgid "minu_tes"
 msgstr "minu_tes"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:135
 msgid "Sending Email"
 msgstr "Envoi du courriel"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2282 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Valeurs par défaut"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:130
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Sécurité"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2385 ../mail/em-account-editor.c:2476
 msgid "Receiving Options"
 msgstr "Options de réception"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2386 ../mail/em-account-editor.c:2477
 msgid "Checking for New Messages"
 msgstr "Recherche de nouveaux messages"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Éditeur de comptes"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Assistant de compte d'Evolution"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
-msgstr "[Défaut]"
-
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "Activé"
+msgstr "[Par défaut]"
 
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "Nom du compte"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Protocole"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "Sans nom"
 
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Langues"
 
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "Ajouter un script de signature"
 
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Signatures"
 
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Message transféré --------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "Un expéditeur inconnu"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1750
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11206,11 +11836,11 @@ msgstr ""
 "Le ${WeekdayName} ${Day} ${MonthName} ${Year} à ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} a écrit :"
 
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-------- Message initial --------"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "Règles de _filtrage"
 
@@ -11227,10 +11857,6 @@ msgstr "Attribuer une couleur"
 msgid "Assign Score"
 msgstr "Attribuer un score"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Pièces jointes"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "Cci"
@@ -11248,10 +11874,6 @@ msgstr "Cc"
 msgid "Completed On"
 msgstr "Terminé "
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "contient"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copier vers le dossier"
@@ -11265,7 +11887,7 @@ msgid "Date sent"
 msgstr "Date d'envoi"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11276,10 +11898,6 @@ msgstr "Supprimer"
 msgid "Deleted"
 msgstr "Supprimé"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "ne contient pas"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "ne finit pas par"
@@ -11300,10 +11918,6 @@ msgstr "ne ressemble pas à"
 msgid "does not start with"
 msgstr "ne commence pas par"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "N'existe pas"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Brouillon"
@@ -11312,10 +11926,6 @@ msgstr "Brouillon"
 msgid "ends with"
 msgstr "finit par"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Existe"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "existe"
@@ -11328,14 +11938,10 @@ msgstr "Expression"
 msgid "Follow Up"
 msgstr "Donner suite"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Important"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "est"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "est après"
@@ -11348,18 +11954,6 @@ msgstr "est avant"
 msgid "is Flagged"
 msgstr "est marqué"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "est supérieur à"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "est inférieur à"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "n'est pas"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "n'est pas marqué"
@@ -11372,7 +11966,7 @@ msgstr "n'est pas défini"
 msgid "is set"
 msgstr "est défini"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Pourriel"
@@ -11381,9 +11975,9 @@ msgstr "Pourriel"
 msgid "Junk Test"
 msgstr "Test pourriel"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
-msgstr "Libellé"
+msgstr "Étiquette"
 
 #: ../mail/em-filter-i18n.h:43
 msgid "Mailing list"
@@ -11423,7 +12017,7 @@ msgstr "Jouer le son"
 
 #. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Lu"
 
@@ -11465,7 +12059,7 @@ msgstr "Expéditeur"
 
 #: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
-msgstr "Définir le libellé"
+msgstr "Définir l'étiquette"
 
 #: ../mail/em-filter-i18n.h:64
 msgid "Set Status"
@@ -11495,10 +12089,9 @@ msgstr "débute par"
 msgid "Stop Processing"
 msgstr "Arrêter le traitement"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:318
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11509,11 +12102,11 @@ msgid "Unset Status"
 msgstr "État non défini"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "Alors"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Ajouter une ac_tion"
 
@@ -11531,7 +12124,7 @@ msgstr "Messages non lus"
 
 #: ../mail/em-folder-browser.c:217
 msgid "No Label"
-msgstr "Aucun libellé"
+msgstr "Aucune étiquette"
 
 #: ../mail/em-folder-browser.c:224
 msgid "Read Messages"
@@ -11558,17 +12151,17 @@ msgid "Messages Not Junk"
 msgstr "Messages non pourriels"
 
 # Vérifier cette traduction dans l'interface
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "Rechercher un compte"
 
 # Vérifier cette traduction dans l'interface
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "Rechercher tous les comptes"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:173
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Messages non lus :"
@@ -11576,31 +12169,36 @@ msgstr[1] "Messages non lus :"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:177
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total des messages :"
 msgstr[1] "Total des messages :"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+msgid "Quota usage"
+msgstr "Consommation de quotas"
+
+#: ../mail/em-folder-properties.c:385
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Propriétés du dossier"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<cliquez ici pour sélectionner un dossier>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "C_réer"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "_Nom du dossier :"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Dossiers de recherche"
 
@@ -11609,27 +12207,27 @@ msgstr "Dossiers de recherche"
 msgid "UNMATCHED"
 msgstr "CORRESPONDPAS"
 
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
+#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Brouillons"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2535
-#: ../mail/mail-component.c:156
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
+#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2540
+#: ../mail/mail-component.c:160
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
 msgid "Inbox"
 msgstr "Boîte de réception"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Boîte d'envoi"
 
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Envoyés"
 
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
 msgid "Loading..."
 msgstr "Chargement..."
 
@@ -11648,7 +12246,7 @@ msgstr "Chargement..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:372
+#: ../mail/em-folder-tree.c:371
 #, c-format
 msgid "folder-display|%s (%u)"
 msgstr "%s (%u)"
@@ -11667,12 +12265,12 @@ msgstr "Déplacement du dossier %s"
 msgid "Copying folder %s"
 msgstr "Copie du dossier %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Déplacement des messages vers le dossier %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copie des messages vers le dossier %s"
@@ -11690,45 +12288,37 @@ msgstr "_Copier vers le dossier"
 msgid "_Move to Folder"
 msgstr "_Déplacer vers le dossier"
 
-#: ../mail/em-folder-tree.c:1704 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1709 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examen des dossiers dans « %s »"
 
-#: ../mail/em-folder-tree.c:2077 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Affichage"
-
-#: ../mail/em-folder-tree.c:2078
+#: ../mail/em-folder-tree.c:2083
 msgid "Open in _New Window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2088
 msgid "_New Folder..."
 msgstr "_Nouveau dossier..."
 
-#: ../mail/em-folder-tree.c:2086
+#: ../mail/em-folder-tree.c:2091
 msgid "_Move..."
 msgstr "_Déplacer..."
 
-#: ../mail/em-folder-tree.c:2093 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2098 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Renommer..."
 
-#: ../mail/em-folder-tree.c:2094
+#: ../mail/em-folder-tree.c:2099
 msgid "Re_fresh"
 msgstr "Ac_tualiser"
 
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2100
 msgid "Fl_ush Outbox"
 msgstr "Vi_der la boîte d'envoi"
 
-#: ../mail/em-folder-tree.c:2101 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2106 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Vider la corbeille"
 
@@ -11737,13 +12327,13 @@ msgstr "_Vider la corbeille"
 msgid "Copying `%s' to `%s'"
 msgstr "Copie de « %s » vers « %s »"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Sélectionnez un dossier"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
 msgid "C_opy"
 msgstr "C_opier"
 
@@ -11765,208 +12355,200 @@ msgstr "Création d'un dossier"
 msgid "Specify where to create the folder:"
 msgstr "Précisez l'emplacement de création du dossier :"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Impossible de supprimer le courriel"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr ""
 "Vous ne disposez pas des droits nécessaires pour supprimer ce courriel."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "_Répondre à l'expéditeur"
 
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:578 ../mail/em-popup.c:589
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Faire suivre"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "É_diter comme un nouveau message..."
 
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "_Imprimer..."
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1348
 msgid "U_ndelete"
 msgstr "_Récupérer"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1349
 msgid "_Move to Folder..."
 msgstr "_Déplacer vers le dossier..."
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1350
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1353
 msgid "Mar_k as Read"
 msgstr "Marquer comme _lu"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Unread"
 msgstr "Marquer comme _non lu"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Important"
 msgstr "Marquer comme _important"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as Un_important"
 msgstr "Marquer comme non im_portant"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Junk"
 msgstr "Marquer comme _pourriel"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as _Not Junk"
 msgstr "Marquer comme non _pourriel"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1359
 msgid "Mark for Follo_w Up..."
 msgstr "Marquer pour _donner suite..."
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1361
 msgid "_Label"
 msgstr "É_tiquette"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Aucun"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1365
 msgid "_New Label"
-msgstr "_Nouveau libellé"
+msgstr "_Nouvelle étiquette"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1369
 msgid "Fla_g Completed"
 msgstr "Marquer _Achevé"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1370
 msgid "Cl_ear Flag"
 msgstr "_Effacer les marqueurs"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1373
 msgid "Crea_te Rule From Message"
 msgstr "Créer une règle à partir du _message"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1375
 msgid "Search Folder based on _Subject"
 msgstr "Dossier de recherche sur le _sujet"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1376
 msgid "Search Folder based on Se_nder"
 msgstr "Dossier de recherche sur l'e_xpéditeur"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1377
 msgid "Search Folder based on _Recipients"
 msgstr "Dossier de recherche sur les de_stinataires"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1378
 msgid "Search Folder based on Mailing _List"
 msgstr "Dossier de recherche sur la _liste de diffusion"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1383
 msgid "Filter based on Sub_ject"
 msgstr "Filtre sur le su_jet"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1384
 msgid "Filter based on Sen_der"
 msgstr "Filtre sur l'expé_diteur"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1385
 msgid "Filter based on Re_cipients"
 msgstr "Filtre sur les de_stinataires"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1386
 msgid "Filter based on _Mailing List"
 msgstr "Filtre sur la _liste de diffusion"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "Impossible de récupérer le message"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "Récupération du message..."
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "A_ppel à..."
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
 msgstr "Créer un nouveau dossier de _recherche"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "_De cette adresse"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "_À cette adresse"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliquer pour envoyer un courriel à %s"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "Cliquer pour appeler %s"
 
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "Cliquer pour masquer/afficher les adresses"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:472
 #, c-format
 msgid "Matches: %d"
 msgstr "Correspond : %d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:616
 msgid "Fin_d:"
 msgstr "_Rechercher :"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:640
 msgid "_Previous"
 msgstr "_Précédent"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:645
 msgid "_Next"
 msgstr "_Suivant"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:650
 msgid "M_atch case"
 msgstr "Respecter la _casse"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Non signé"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11974,11 +12556,11 @@ msgstr ""
 "Ce message n'est pas signé. Il n'y a aucune garantie que ce message soit "
 "authentique."
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Signature valide"
 
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11986,11 +12568,11 @@ msgstr ""
 "Ce message est signé et valide, ce qui signifie que ce message est "
 "vraisemblablement authentique."
 
-#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Signature non valide"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11998,11 +12580,11 @@ msgstr ""
 "La signature de ce message ne peut pas être vérifiée, il se peut qu'il ait "
 "été altéré lors de la transmission."
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Signature valide, mais impossible de vérifier l'expéditeur"
 
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12010,22 +12592,22 @@ msgstr ""
 "Ce message est signé avec une signature valide, mais l'expéditeur du message "
 "ne peut pas être vérifié."
 
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "La signature existe, mais elle requiert une clé publique"
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:953
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr ""
 "Ce message est signé avec une signature dont la clé publique est absente."
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Non chiffré"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12033,11 +12615,11 @@ msgstr ""
 "Ce message n'est pas chiffré. Son contenu peut être lu lors de son passage "
 "sur Internet."
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Chiffré, faiblement"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:961
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12047,11 +12629,11 @@ msgstr ""
 "sera difficile, mais pas impossible, pour une tierce personne de voir le "
 "contenu de ce message dans une période de temps raisonnable."
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Chiffré"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:962
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12059,11 +12641,11 @@ msgstr ""
 "Ce message est chiffré. Il sera difficile pour une tierce personne de voir "
 "le contenu de ce message."
 
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Chiffré, fortement"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:963
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12073,94 +12655,89 @@ msgstr ""
 "vraiment difficile, pour une tierce personne, de voir le contenu de ce "
 "message dans une période de temps raisonnable."
 
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1064 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Voir le certificat"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1079
 msgid "This certificate is not viewable"
 msgstr "Ce certificat n'est pas affichable"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1372
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Achevé le %d %B %Y à %H:%M"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1380
 msgid "Overdue:"
 msgstr "Retard :"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1383
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "le %d %B %Y, %H:%M"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1461
 msgid "_View Inline"
 msgstr "_Afficher dans le corps"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1462
 msgid "_Hide"
 msgstr "_Masquer"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1463
 msgid "_Fit to Width"
 msgstr "Adapter à la _largeur"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1464
 msgid "Show _Original Size"
 msgstr "Afficher à la taille d'_origine"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Pièce jointe"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1984
 msgid "Save attachment as"
 msgstr "Enregistrer les pièces jointes sous"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1988
 msgid "Select folder to save all attachments"
 msgstr "Sélectionner le dossier pour enregistrer toutes les pièces jointes"
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2039
 msgid "_Save Selected..."
 msgstr "Enregi_strer la sélection..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2106
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d pièce joi_nte"
 msgstr[1] "%d pièces joi_ntes"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2113 ../mail/em-format-html-display.c:2202
 msgid "S_ave"
 msgstr "Enregi_strer"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2124
 msgid "S_ave All"
 msgstr "_Tout enregistrer"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2198
 msgid "No Attachment"
 msgstr "Aucune pièce jointe"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2339 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "Afficher _sans mise en forme"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2341
 msgid "Hide _Unformatted"
 msgstr "Masquer _non formaté"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2396
 msgid "O_pen With"
 msgstr "_Ouvrir avec"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2467
 msgid ""
-"Evolution cannot render this email as it is too large to handle. You can "
+"Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
 "Evolution ne peut pas afficher ce courriel car il trop volumineux pour être "
@@ -12172,286 +12749,299 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Page %d sur %d"
 
-#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Récupération de « %s »"
 
-#: ../mail/em-format-html.c:916
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "Partie externe au corps inconnue."
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "Partie externe au corps mal formée."
 
-#: ../mail/em-format-html.c:954
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointeur sur le site FTP (%s)"
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pointeur sur le fichier local (%s) valide sur le site « %s »"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointeur sur le fichier local (%s)"
 
-#: ../mail/em-format-html.c:988
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointeur sur des données distantes (%s)"
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointeur sur des données externes inconnues (type « %s »)"
 
-#: ../mail/em-format-html.c:1227
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "Formatage des messages"
 
-#: ../mail/em-format-html.c:1394
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "Formatage du message..."
 
-#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1547 ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Cci"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Client de messagerie"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1733
+#: ../mail/em-format-html.c:1771
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1738
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "Date"
-
-#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-msgid "Newsgroups"
-msgstr "Groupes de discussion"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1866
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Ce message a été envoyé par <b>%s</b> pour le compte de <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:314
 msgid "From"
 msgstr "De"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Répondre à"
 
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
+#: ../widgets/misc/e-dateedit.c:353
+msgid "Date"
+msgstr "Date"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "Groupes de discussion"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "pièce jointe %s"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1198
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Impossible d'analyser le message S/MIME : erreur inconnue"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1335 ../mail/em-format.c:1491
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Impossible d'analyser le message MIME. Afficher comme source."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1343
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Type de chiffrement non pris en charge pour multipart/encrypted"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1353
 msgid "Could not parse PGP/MIME message"
 msgstr "Impossible d'analyser le message PGP/MIME"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1353
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Impossible d'analyser le message PGP/MIME : erreur inconnue"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1510
 msgid "Unsupported signature format"
 msgstr "Format de signature non pris en charge"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1589
 msgid "Error verifying signature"
 msgstr "Erreur lors de la vérification de la signature"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1580 ../mail/em-format.c:1589
 msgid "Unknown error verifying signature"
 msgstr "Erreur inconnue lors de la vérification de la signature"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1661
 msgid "Could not parse PGP message"
 msgstr "Impossible d'analyser le message PGP"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1661
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Impossible d'analyser le message PGP : erreur inconnue"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "À chaque fois"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "Une fois par jour"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "Une fois par semaine"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "Une fois par mois"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "Ajouter des en-têtes de pourriels personnalisés"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "_Nom de l'en-tête :"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "La valeur de l'en-tête contient :"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "Contient la valeur"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "Couleur"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "Étiquette"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Le greffon %s est disponible et le paquet binaire est installé."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "Le greffon %s n'est pas disponible. Vérifiez si le paquet est installé."
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "Aucun greffon de pourriel disponible"
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "À faire"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Plus tard"
 
-#: ../mail/em-migrate.c:1211
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"L'emplacement et la hiérarchie des dossiers des boîtes à lettres ont changé "
-"depuis Evolution 1.x.\n"
-"\n"
-"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
+#: ../mail/em-migrate.c:1247
+#, c-format
+msgid "Migrating '%s':"
+msgstr "Migration de « %s » :"
 
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Impossible de créer le nouveau dossier « %s » : %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Impossible de copier le dossier « %s » vers « %s » : %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Impossible de rechercher les boîtes à lettres existant dans « %s » : %s"
+
+#: ../mail/em-migrate.c:1868
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Impossible de rechercher les boîtes à lettres existant dans « %s » : %s"
+"L'emplacement et la hiérarchie des dossiers des boîtes à lettres ont changé "
+"depuis Evolution 1.x.\n"
+"\n"
+"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
 
-#: ../mail/em-migrate.c:2065
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 "Impossible d'ouvrir les anciennes données POP conservées sur le serveur « %"
 "s » : %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Impossible de créer un dossier pour les données POP3 restées sur le serveur "
 "« %s » : %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 "Impossible de copier les données POP3 restées sur le serveur « %s »  : %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 "La création du dossier de stockage de courriel local « %s » a échoué : %s"
 
-#: ../mail/em-migrate.c:2827
+#: ../mail/em-migrate.c:2898
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Le format de résumé des dossiers de courriel d'Evolution utilise SQLite "
+"depuis Evolution 2.24.\n"
+"\n"
+"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
-"Impossible de créer les dossiers de stockage de courriel local sur « %s » : %"
-"s"
+"Impossible de créer les dossiers de stockage de courriel local sur « %s » : %s"
 
-#: ../mail/em-migrate.c:2846
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12459,64 +13049,67 @@ msgstr ""
 "Impossible de lire les paramètres de l'installation d'Evolution précédente, "
 "« evolution/config.xmldb » n'existe pas ou est corrompu."
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 msgid "_Reply to sender"
 msgstr "_Répondre à l'expéditeur"
 
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Répondre à la _liste"
 
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
 msgid "_Add to Address Book"
 msgstr "_Ajouter dans le carnet d'adresses"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Soit ce stockage ne prend pas en charge les abonnements, soit ils ne sont "
 "pas activés."
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Abonné"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Dossier"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "Sélectionnez un serveur."
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "Aucun serveur n'a été sélectionné."
 
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "_Ne plus afficher ce message."
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "Filtres de messages"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "message"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "Enregistrer le message..."
 
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "Ajouter adresse"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages de %s"
@@ -12530,55 +13123,67 @@ msgid "Search Folder source"
 msgstr "Source du dossier de recherche"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Hauteur de la fenêtre « Envoi et réception du courriel »"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "État de maximisation de la fenêtre « Envoi et réception du courriel »"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Send and Receive Mail\" window width"
+msgstr "Largeur de la fenêtre « Envoi et réception du courriel »"
+
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
 msgstr ""
 "Permet à Evolution d'afficher des extraits de texte d'une taille limitée"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Toujours demander un accusé de lecture"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Durée d'affichage en secondes de l'erreur dans la barre d'état."
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Reconnaître automatiquement les frimousses"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "Reconnaître automatiquement les liens"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "Vérifier si les messages entrants sont des pourriels"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "Couleur de surbrillance des citations"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "Couleur de surbrillance des citations."
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "Hauteur par défaut de la fenêtre d'édition"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "Largeur par défaut de la fenêtre d'édition"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "Répertoire de l'éditeur pour charger/joindre"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Compresser l'affichage des adresses dans À/Cc/Cci"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12586,65 +13191,85 @@ msgstr ""
 "Compresser l'affichage des adresses dans À/Cc/Cci au nombre indiqué dans "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid "Custom headers to use while checking for junk."
+msgstr "En-têtes personnalisés à utiliser pour la détection des pourriels."
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"En-têtes personnalisés à utiliser pour la détection des pourriels. Les "
+"éléments de la liste sont des chaînes au format « nom_entête=valeur »."
+
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Default charset in which to compose messages"
 msgstr "Jeu de caractère par défaut pour la rédaction des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages."
 msgstr "Jeu de caractère par défaut pour la rédaction des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to display messages"
 msgstr "Jeu de caractère par défaut pour l'affichage des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages."
 msgstr "Jeu de caractère par défaut pour l'affichage des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default forward style"
 msgstr "Style de transfert par défaut"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default height of the Composer Window."
 msgstr "Hauteur par défaut de la fenêtre d'édition."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the message window."
 msgstr "Hauteur par défaut de la fenêtre des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the subscribe dialog."
 msgstr "Hauteur par défaut du dialogue des abonnements."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default reply style"
 msgstr "Style de réponse par défaut"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default value for thread expand state"
 msgstr "Valeur par défaut pour l'état d'expansion des fils de discussion"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default width of the Composer Window."
 msgstr "Largeur par défaut de la fenêtre d'édition."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the message window."
 msgstr "Largeur par défaut de la fenêtre des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the subscribe dialog."
 msgstr "Largeur par défaut de la boîte de dialogue des abonnements."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid ""
+"Determines whether to look up addresses for junk filtering in local "
+"addressbook only"
+msgstr ""
+"Indique s'il faut vérifier les adresses pour le filtrage des pourriels "
+"seulement dans le carnet d'adresses local"
+
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr ""
 "Indique s'il faut consulter le carnet d'adresses pour l'expéditeur du "
 "courriel"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12657,13 +13282,13 @@ msgstr ""
 "l'opération peut être lente si vous utilisez des carnets d'adresses distants "
 "(tel que LDAP)."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Indique s'il faut utiliser des en-têtes personnalisés pour la détection des "
 "pourriels"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12673,7 +13298,7 @@ msgstr ""
 "pourriels. Si cette option est active et que des en-têtes sont renseignés, "
 "la détection des pourriels sera plus rapide."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -12681,57 +13306,63 @@ msgstr ""
 "Indique s'il faut utiliser les mêmes polices pour les lignes « De » et "
 "« Sujet » dans la colonne « Messages » en affichage verticale."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Directory for loading/attaching files to composer."
 msgstr "Répertoire pour charger/joindre des fichiers dans l'éditeur."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for saving mail component files."
 msgstr "Répertoire pour enregistrer les fichiers joints aux courriels."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgstr ""
+"Activer ou désactiver les points de suspension dans les noms de dossier de "
+"l'arborescence des dossiers"
+
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Afficher les indicateurs de fautes d'orthographe au fil de la saisie."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Empty Junk folders on exit"
 msgstr "Vider les dossiers Pourriels en quittant"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Trash folders on exit"
 msgstr "Vider les dossiers Corbeille en quittant"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Vider tous les dossiers Pourriels en quittant Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vider tous les dossiers Corbeille en quittant Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Activer la lecture au curseur, ainsi vous pouvez voir un curseur quand vous "
 "lisez vos mails."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable or disable magic space bar"
 msgstr "Activer ou désactiver la barre d'espace magique"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable type ahead search feature"
 msgstr "Activer ou désactiver la fonctionnalité de recherche interactive."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable search folders"
 msgstr "Activer les dossiers de recherche"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders on startup."
 msgstr "Active les dossiers de recherche au démarrage."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12743,7 +13374,7 @@ msgstr ""
 "barre latérale saisissez simplement son nom et la sélection ira "
 "automatiquement sur ce dossier."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12751,27 +13382,27 @@ msgstr ""
 "Activez ceci pour défiler avec la barre Espace dans l'aperçu des messages, "
 "les listes de messages et les dossiers."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable to render message text part of limited size."
 msgstr "Activer l'affichage partiel du texte selon une limite de taille."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable/disable caret mode"
 msgstr "Activer/désactiver la lecture au curseur"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Height of the message-list pane"
 msgstr "Hauteur du panneau de la liste des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane."
 msgstr "Hauteur du panneau de la liste des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Masque l'aperçu par dossier et supprime la sélection"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12779,7 +13410,7 @@ msgstr ""
 "Si un utilisateur essaye d'ouvrir 10 messages ou plus en une seule fois, lui "
 "demander si c'est réellement ce qu'il désire."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12787,7 +13418,7 @@ msgstr ""
 "Si le panneau de prévisualisation est activé, il sera affiché côte à côte "
 "plutôt que verticalement."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12798,13 +13429,43 @@ msgstr ""
 "qui est attribué à un afficheur de composant bonobo, dans la base des types "
 "MIME GNOME, peut être utilisé pour l'affichage du contenu."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Hauteur initiale de la fenêtre « Envoi et réception du courriel ». La valeur "
+"est mise à jour si l'utilisateur redimensionne la fenêtre verticalement."
+
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+"État maximisé initial de la fenêtre « Envoi et réception du courriel ». La "
+"valeur est mise à jour si l'utilisateur maximise ou démaximise la fenêtre. "
+"Notez que cette valeur particulière n'est pas utilisée par Evolution puisque "
+"la fenêtre « Envoi et réception du courriel » ne peut pas être maximisée. "
+"Cette clé n'est qu'un détail d'implémentation."
+
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Largeur initiale de la fenêtre « Envoi et réception du courriel ». La valeur "
+"est mise à jour si l'utilisateur redimensionne la fenêtre horizontalement."
+
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr ""
 "Ceci active ou désactive la confirmation lors du marquage de messages "
 "multiples."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -12812,7 +13473,7 @@ msgstr ""
 "Ceci active ou désactive les messages de confirmation répétés qui demandent "
 "si la synchronisation hors ligne est requise avant de basculer dans ce mode."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -12822,31 +13483,31 @@ msgstr ""
 "suppression de messages du dossier de recherche supprime définitivement ces "
 "messages, et ne les supprime pas simplement des résultats de recherche."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Last time empty junk was run"
 msgstr "Dernière fois où les pourriels ont été vidés"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty trash was run"
 msgstr "Dernière fois où la corbeille a été vidée"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Level beyond which the message should be logged."
 msgstr "Niveau au-delà duquel les messages doivent être journalisés."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "List of Labels and their associated colors"
-msgstr "Liste des libellés et des couleurs qui leur sont associées"
+msgstr "Liste des étiquettes et des couleurs qui leur sont associées"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of accepted licenses"
 msgstr "Liste des licences acceptées"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accounts"
 msgstr "Liste de comptes"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12855,33 +13516,39 @@ msgstr ""
 "liste contient des chaînes désignant les noms des sous-dossiers relatifs à /"
 "apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of custom headers and whether they are enabled."
 msgstr "Liste des en-têtes personnels et de leur activation."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+"Liste des codes de langue des dictionnaires utilisés pour la vérification "
+"orthographique."
+
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
-"Liste des libellés connus pour le client de messagerie d'Evolution. Cette "
-"liste contient des chaînes de type nom:couleur où les couleurs utilisent "
-"l'encodage hexadécimal HTML."
+"Liste des étiquettes connues pour le client de messagerie d'Evolution. Cette "
+"liste contient des chaînes de type nom:couleur où les couleurs utilisent le "
+"codage hexadécimal HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Liste des types MIME à vérifier pour les composants bonobo de visualisation"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste des noms de protocoles dont la licence a été acceptée."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Load images for HTML messages over http"
 msgstr "Charger les images pour les messages HTML en utilisant http"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net. 1 - Load images in messages from contacts. 2 - "
@@ -12892,112 +13559,111 @@ msgstr ""
 "charger les images si l'expéditeur est dans le carnet d'adresses et 2 - "
 "toujours charger les images à partir du net."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Log filter actions"
 msgstr "Enregistrer les actions des filtres"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions to the specified log file."
 msgstr ""
 "Enregistre les actions des filtres dans le fichier de journal spécifié."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Logfile to log filter actions"
 msgstr "Fichier de journal où enregistrer les actions des filtres"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions."
 msgstr "Fichier de journal où enregistrer les actions des filtres."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Mark as Seen after specified timeout"
 msgstr "Marquer comme lu après le délai spécifié"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout."
 msgstr "Marquer comme lu après le délai spécifié."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marquer les citations dans le message « Preview »"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marquer les citations dans le message « Preview »."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Message Window default height"
 msgstr "Hauteur par défaut de la fenêtre des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default width"
 msgstr "Largeur par défaut de la fenêtre des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
-"Style d'affichage des messages (« normal », « en-têtes complets », "
-"« source »)"
+"Style d'affichage des messages (« normal », « en-têtes complets », « source »)"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Nombre minimum de jours entre les vidages de pourriels en quittant"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Nombre minimum de jours entre les vidages de corbeille en quittant"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Durée minimum en jours entre les vidages de pourriels en quittant."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Durée minimum en jours avant de vider la corbeille en quittant."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Nombre d'adresses à afficher pour À/Cc/Cci"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Prompt on empty subject"
 msgstr "Demander pour les sujets vides"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Demander à l'utilisateur quand il ou elle essaie de nettoyer un dossier."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Demander confirmation à l'utilisateur quand il ou elle envoie des message "
 "sans sujet."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr ""
 "Demander à l'utilisateur s'il désire passer immédiatement en mode hors ligne"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt when deleting messages in search folder"
 msgstr ""
 "De_mander lors de la suppression de messages dans un dossier de recherche"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when user expunges"
 msgstr "Demander quand l'utilisateur nettoie"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user only fills Bcc"
 msgstr "Demander si l'utilisateur remplit uniquement Cci"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Demander lors de l'envoi de 10 messages ou plus à la fois"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13005,77 +13671,77 @@ msgstr ""
 "Demander lors de l'envoi de messages HTML à des contacts qui n'en veulent "
 "pas."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Demander lors de l'envoi de messages où seuls des destinataires sans À ou Cc "
 "définis"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 "Demander lorsque l'utilisateur essaye d'envoyer des message HTML non désirés"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt while marking multiple messages"
 msgstr "Demander lors du marquage de messages multiples"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Recognize emoticons in text and replace them with images."
 msgstr ""
 "Reconnaître les frimousses dans le texte et les remplacer par des images."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize links in text and replace them."
 msgstr "Reconnaître les liens dans le texte et les remplacer."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Run junk test on incoming mail."
 msgstr "Lancer le test de pourriel sur les messages entrants."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Save directory"
 msgstr "Répertoire de sauvegarde"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Search for the sender photo in local addressbooks"
 msgstr "Chercher la photo de l'expéditeur dans les carnets d'adresses locaux"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Send HTML mail by default"
 msgstr "Envoyer par défaut le courriel au format HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default."
 msgstr "Envoyer par défaut le courriel au format HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Sender email-address column in the message list"
 msgstr "Colonne du courriel de l'expéditeur dans la liste des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Show Animations"
 msgstr "Afficher les animations"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Show animated images as animations."
 msgstr "Afficher les images animées comme une animation."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Afficher les messages supprimés (comme barrés) dans la liste des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show deleted messages in the message-list"
 msgstr ""
 "Afficher les messages marqués comme supprimés dans la liste des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show photo of the sender"
 msgstr "Afficher la photo de l'expéditeur"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -13083,64 +13749,60 @@ msgstr ""
 "Afficher le courriel de l'expéditeur dans une colonne à part dans la liste "
 "des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Afficher la photo de l'expéditeur dans le volet de lecture de message."
 
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "Specifies the header to check for junk."
-msgstr "Indique l'en-tête à contrôler pour détecter le pourriel."
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr ""
-"Indique l'en-tête à contrôler pour détecter le pourriel. Le format est "
-"nom_en-tête=valeur dans gconf."
-
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Spell check inline"
 msgstr "Correction orthographique en ligne"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Spell checking color"
+msgstr "Couleur du correcteur orthographique"
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Spell checking languages"
+msgstr "Langues du correcteur orthographique"
+
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Subscribe dialog default height"
 msgstr "Hauteur par défaut de la fenêtre d'abonnements"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Subscribe dialog default width"
 msgstr "Largeur par défaut de la fenêtre d'abonnements"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Terminal font"
 msgstr "Police du terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Text message part limit"
 msgstr "Limite de la partie texte du message"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "The default plugin for Junk hook"
 msgstr "Le greffon par défaut pour le traitement du pourriel"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "Dernier vidage des pourriels, en jours depuis le 1/1/1970."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 "La dernière fois que la corbeille a été vidée, en jours depuis le 1/1/1970."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The terminal font for mail display."
 msgstr "La police de terminal pour l'affichage des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The variable width font for mail display."
 msgstr "La police à largeur variable pour l'affichage des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -13148,7 +13810,7 @@ msgstr ""
 "Cette option peut prendre les valeurs suivantes : 0 pour les erreurs, 1 pour "
 "les avertissements et 2 pour les messages de débogage."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -13157,7 +13819,7 @@ msgstr ""
 "sous Evolution. La taille par défaut est 4 096 Kio (4 Mio) et est renseignée "
 "en Kio."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13167,7 +13829,7 @@ msgstr ""
 "soient activés. Si le greffon listé par défaut est désactivé, les autres "
 "greffons disponibles ne prendront pas le relais."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "This key is read only once and reset to false after read. This unselects the "
 "mail in the list and removes the preview for that folder."
@@ -13175,7 +13837,7 @@ msgstr ""
 "Cette clé est lue une fois, puis définie à faux après la lecture. Cela "
 "désélectionne le message dans la liste et supprime l'aperçu pour ce dossier."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13187,11 +13849,22 @@ msgstr ""
 "XML est &lt;header enabled&gt; - activé si l'en-tête est affiché dans la vue "
 "du courriel."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local addressbook only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+"Cette option est relative à la clé « lookup_addressbook » et est utilisée "
+"pour savoir s'il faut vérifier les adresses seulement dans le carnet "
+"d'adresses local pour exclure du filtrage pourriel les courriels envoyés par "
+"des contacts connus."
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "This option would help in improving the speed of fetching."
 msgstr "Cette option peut aider à accélérer la vitesse de chargement."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13199,7 +13872,7 @@ msgstr ""
 "Cela définit le nombre d'adresses à afficher dans la vue de la liste de "
 "messages par défaut, au-delà duquel « ... » est affiché."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13207,7 +13880,7 @@ msgstr ""
 "Ce paramètre indique si les fils de discussion doivent être dans un état "
 "étendu ou compact par défaut. Evolution nécessite un redémarrage."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13217,109 +13890,136 @@ msgstr ""
 "dernier message de chaque fil de discussion, plutôt que par date. Evolution "
 "nécessite un redémarrage."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Thread the message list."
 msgstr "Liste de messages par fil de discussion."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Thread the message-list"
 msgstr "Liste de messages par fil de discussion"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message-list based on Subject"
 msgstr "Liste de messages basée sur les sujets"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Time interval, in seconds, how often upload store changes to server."
+msgstr ""
+"Intervalle de temps en secondes spécifiant la fréquence d'envoi des "
+"modifications du stockage vers le serveur"
+
+#: ../mail/evolution-mail.schemas.in.h:152
+msgid ""
+"Time interval, in seconds, how often upload store changes to server. The "
+"actual value cannot be less than 30 seconds."
+msgstr ""
+"Intervalle de temps en secondes spécifiant la fréquence d'envoi des "
+"modifications du stockage vers le serveur. La valeur ne peut être inférieure "
+"à 30 secondes."
+
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Délai avant de marquer les messages comme vus"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "Délai avant de marquer les messages comme vus."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "Chaîne UID pour le compte par défaut."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+"Couleur de soulignement des mots mal orthographiés lors de la vérification "
+"orthographique en cours de frappe."
+
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
 msgstr "Utiliser le démon et le client Spamassassin"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Utiliser le démon et le client Spamassassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "Utiliser des polices personnalisées"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "Utiliser des polices personnalisées pour afficher le courriel."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "Utiliser seulement des tests de pourriels locaux."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Utiliser seulement des tests de pourriels locaux (pas de DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "Utiliser l'agencement côte à côte ou large"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "Largeur de polices variable"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "L'élément du menu Affichage/Cci est coché"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "L'élément du menu Affichage/Cci est coché."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "L'élément du menu Affichage/Cc est coché"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "L'élément du menu Affichage/Cc est coché."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "L'élément du menu Affichage/De est coché"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "L'élément du menu Affichage/De est coché."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "L'élément du menu Affichage/Envoyer À est coché"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "L'élément du menu Affichage/Envoyer À est coché."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "L'élément du menu Affichage/Répondre À est coché"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "L'élément du menu Affichage/Répondre À est coché."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Indique si une demande d'accusé de lecture doit être ajoutée à chaque "
 "message par défaut."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgstr ""
+"Indique s'il faut désactiver la fonctionnalité de coupure des noms de "
+"dossier dans l'arborescence des dossiers."
+
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13327,45 +14027,45 @@ msgstr ""
 "Retomber ou pas sur le tri par sujet quand les messages ne contiennent pas "
 "d'en-têtes In-Reply-To ou References."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 "Indique si les fils de discussion doivent êtres triés suivant le dernier "
 "message de leur fil."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "Largeur du panneau de la liste des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "Largeur du panneau de la liste des messages."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Importation des données Elm"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Assistant d'importation Elm d'Evolution"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Importation des boîtes à lettres de Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "Dossier de destination :"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "Sélectionnez un dossier pour l'importation"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Boîte à lettres Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importe les dossiers au format de boîte à lettres Berkeley"
 
@@ -13373,7 +14073,7 @@ msgstr "Importe les dossiers au format de boîte à lettres Berkeley"
 msgid "Importing mailbox"
 msgstr "Importation des boîtes à lettres"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importation de « %s »"
@@ -13383,15 +14083,15 @@ msgstr "Importation de « %s »"
 msgid "Scanning %s"
 msgstr "Examen de %s"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "Importation des données de Pine"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Assistant d'importation Pine d'Evolution"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Importation des boîtes à lettres de Pine."
 
@@ -13419,139 +14119,152 @@ msgstr "Liste de diffusion %s"
 msgid "Add Filter Rule"
 msgstr "Ajouter une règle de filtre"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Modèles"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d sélectionné, "
 msgstr[1] "%d sélectionnés, "
 
-#: ../mail/mail-component.c:540
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d supprimé"
 msgstr[1] "%d supprimés"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d pourriel"
 msgstr[1] "%d pourriels"
 
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d brouillon"
 msgstr[1] "%d brouillons"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d envoyé"
 msgstr[1] "%d envoyés"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d non envoyé"
 msgstr[1] "%d non envoyés"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d non lu,"
 msgstr[1] "%d non lus,"
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: ../mail/mail-component.c:896
+#: ../mail/mail-component.c:914
 msgid "New Mail Message"
 msgstr "Nouveau message"
 
-#: ../mail/mail-component.c:897
+#: ../mail/mail-component.c:915
 msgid "_Mail Message"
 msgstr "_Message"
 
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:916
 msgid "Compose a new mail message"
 msgstr "Rédiger un nouveau courriel"
 
-#: ../mail/mail-component.c:904
+#: ../mail/mail-component.c:922
 msgid "New Mail Folder"
 msgstr "Nouveau dossier pour le courriel"
 
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:923
 msgid "Mail _Folder"
 msgstr "_Dossier de courriel"
 
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:924
 msgid "Create a new mail folder"
 msgstr "Crée un nouveau dossier pour le courriel"
 
-#: ../mail/mail-component.c:1053
+#: ../mail/mail-component.c:1071
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Échec lors de la mise à jour des dossiers ou paramètres de courriel."
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1584
 msgid "Error"
 msgstr "Erreur"
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1584
 msgid "Errors"
 msgstr "Erreurs"
 
-#: ../mail/mail-component.c:1523
+#: ../mail/mail-component.c:1585
 msgid "Warnings and Errors"
 msgstr "Avertissements et erreurs"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1586
 msgid "Debug"
 msgstr "Débogage"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1586
 msgid "Error, Warnings and Debug messages"
 msgstr "Messages d'erreur, d'avertissement et de débogage"
 
-#: ../mail/mail-component.c:1634
+#: ../mail/mail-component.c:1713
 msgid "Debug Logs"
 msgstr "Journaux de débogage"
 
-#: ../mail/mail-component.c:1638
+#: ../mail/mail-component.c:1727
 msgid "Show _errors in the status bar for"
 msgstr "Afficher les _erreurs dans la barre d'état pendant"
 
-#: ../mail/mail-component.c:1645
-msgid "seconds."
-msgstr "secondes."
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1743
+msgid "second(s)."
+msgstr "seconde(s)."
 
-#: ../mail/mail-component.c:1655
+#: ../mail/mail-component.c:1749
 msgid "Log Messages:"
 msgstr "Journal des messages :"
 
-#: ../mail/mail-component.c:1707
+#: ../mail/mail-component.c:1790
 msgid "Log Level"
 msgstr "Niveau du journal"
 
-#: ../mail/mail-component.c:1714 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1799 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Heure"
 
-#: ../mail/mail-component.c:1721 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1809 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Messages"
 
+#: ../mail/mail-component.c:1818 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Ferme cette fenêtre"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " _Vérifier les types pris en charge "
@@ -13565,7 +14278,7 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL n'est pas pris en charge dans cette compilation d'Evolution</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>Photo de l'expéditeur</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13610,7 +14323,7 @@ msgstr "<span weight=\"bold\">Afficher les _en-têtes des messages</span>"
 
 #: ../mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Labels</span>"
-msgstr "<span weight=\"bold\">Libellés</span>"
+msgstr "<span weight=\"bold\">Étiquettes</span>"
 
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
@@ -13646,75 +14359,75 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Polices d'impression</span>"
 
 #: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">Réglages du serveur mandataire</span>"
+
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Informations requises</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Sécurité</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Messages envoyés et brouillons</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Configuration du serveur</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">Type d'_authentification</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Gestion des comptes"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Ajouter une _nouvelle signature..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Ajouter un sc_ript"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr ""
 "_Toujours signer les messages sortants lors de l'utilisation de ce compte"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Chiffrer également pour _moi-même lors de l'envoi de messages chiffrés"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Toujours envoyer une copie (_Cc) à :"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Toujours envoyer une copie cachée (Cc_i) à :"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 "Toujours faire _confiance aux clés de mon trousseau lors du chiffrement"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Toujours chiffrer pour _moi-même lors de l'envoi de messages chiffrés"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr "Toujours demander un accusé de _lecture"
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "Joindre le message d'origine"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
 msgstr "Insérer automatiquement les images de frimou_sses"
@@ -13732,13 +14445,13 @@ msgid "C_haracter set:"
 msgstr "Jeu de _caractères :"
 
 #: ../mail/mail-config.glade.h:50
-msgid "C_heck custom headers for junk"
-msgstr "Détecter les pourriels en utilisant les _en-têtes personnalisés"
-
-#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "_Vérifier les types pris en charge "
 
+#: ../mail/mail-config.glade.h:51
+msgid "Check cu_stom headers for junk"
+msgstr "Détecter les pourriels en utilisant des en-têtes per_sonnalisés"
+
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
 msgstr "Détecter les pourriels dans les _messages entrants"
@@ -13799,20 +14512,20 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Signer numériquement les messages _sortants (par défaut)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
-msgstr ""
-"Ne _pas marquer les messages comme pourriel si l'expéditeur est présent dans "
-"le carnet d'adresses"
-
-#: ../mail/mail-config.glade.h:72
 msgid "Do not format text contents in messages if the text si_ze exceeds"
 msgstr ""
 "Ne pas mettre en forme le contenu du texte dans les messages quand la taille "
 "du texte excède"
 
+#: ../mail/mail-config.glade.h:72
+msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgstr ""
+"Ne _pas marquer les messages comme pourriel si l'expéditeur est présent dans "
+"mon carnet d'adresses"
+
 #: ../mail/mail-config.glade.h:73
-msgid "Do not quote original message"
-msgstr "Ne pas citer le message d'origine"
+msgid "Do not quote"
+msgstr "Ne pas citer"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -13875,57 +14588,65 @@ msgid "HTML Messages"
 msgstr "Messages HTML"
 
 #: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr "Serveur mandataire H_TTP :"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "En-têtes"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "Mettre les citations en _surbrillance avec"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "Dans le corps"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
-msgstr "Message initial dans le corps (style Outlook)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr "Dans le corps (style Outlook)"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr "Kio"
 
-#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
 msgid "Labels"
-msgstr "Libellés"
+msgstr "Étiquettes"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "Langues"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "Configuration de la messagerie"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "En-têtes des messages"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "Emplacement de la boîte à lettres"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "Éditeur de messages"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr "Pas de serveur mandataire _pour :"
+
+#: ../mail/mail-config.glade.h:107
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
-"Note : le tiret bas dans les libellés est utilisé comme raccourci dans le "
+"Note : le tiret bas dans les étiquettes est utilisé comme raccourci dans le "
 "menu."
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -13933,15 +14654,19 @@ msgstr ""
 "Note : vous n'aurez pas à fournir de mot de passe avant votre première "
 "connexion"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:109
 msgid "Or_ganization:"
 msgstr "Or_ganisation :"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:110
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de la _clé PGP/GPG :"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
+msgid "Pass_word:"
+msgstr "_Mot de passe :"
+
+#: ../mail/mail-config.glade.h:113
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13949,7 +14674,7 @@ msgstr ""
 "Saisissez un nom descriptif pour ce compte dans l'espace ci-dessous.\n"
 "Ce nom sera seulement utilisé à des fins d'affichage."
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:115
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13958,7 +14683,7 @@ msgstr ""
 "doute, adressez-vous à votre administrateur système ou à votre fournisseur "
 "d'accès Internet."
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13968,111 +14693,119 @@ msgstr ""
 "« optionnels » ci-dessous n'ont pas besoin d'être remplis, à moins que vous "
 "ne désiriez inclure ces informations dans les messages que vous envoyez."
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:117
 msgid "Please select among the following options"
 msgstr "Sélectionnez une option parmi les suivantes"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:118
+msgid "Port:"
+msgstr "Port :"
+
+#: ../mail/mail-config.glade.h:119
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "_Demander lors de l'envoi de messages où seuls des destinataires Cci sont "
 "définis"
 
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr "Citer le message d'origine"
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:120
 msgid "Quoted"
 msgstr "Cité"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:121
 msgid "Re_member password"
 msgstr "_Mémoriser le mot de passe"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:122
 msgid "Re_ply-To:"
 msgstr "Ré_pondre à :"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Remember _password"
 msgstr "_Mémoriser le mot de passe"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:125
+msgid "S_OCKS Host:"
+msgstr "Hôte S_OCKS :"
+
+#: ../mail/mail-config.glade.h:126
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr ""
 "R_echercher la photo de l'expéditeur uniquement dans les carnets d'adresses "
 "locaux"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:127
 msgid "S_elect..."
 msgstr "S_électionner..."
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:128
 msgid "S_end message receipts:"
 msgstr "_Envoie des accusés de réception des messages :"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:129
 msgid "S_tandard Font:"
 msgstr "Police par _défaut :"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:131
 msgid "Select HTML fixed width font"
 msgstr "Sélection d'une police HTML à largeur fixe"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font for printing"
 msgstr "Sélection d'une police HTML à largeur fixe pour l'impression"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML variable width font"
 msgstr "Sélection d'une police HTML à largeur variable"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font for printing"
 msgstr "Sélection d'une police HTML à largeur variable pour l'impression"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:136
 msgid "Sending Mail"
 msgstr "Envoi de courriels"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:137
 msgid "Sent _Messages Folder:"
 msgstr "Dossier des _messages envoyés :"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:138
 msgid "Ser_ver requires authentication"
 msgstr "Le _serveur requiert une authentification"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:139
 msgid "Server _Type: "
 msgstr "_Type de serveur : "
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:140
 msgid "Sig_ning certificate:"
 msgstr "Certificat de _signature :"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:141
 msgid "Signat_ure:"
 msgstr "Signat_ure :"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:142
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures Table"
 msgstr "Signatures"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:144
 msgid "Spell Checking"
 msgstr "Correction orthographique"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:145
+msgid "Start _typing at the bottom on replying"
+msgstr "_Commencer la rédaction en bas lors des réponses"
+
+#: ../mail/mail-config.glade.h:146
 msgid "T_ype: "
 msgstr "T_ype : "
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:147
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14080,7 +14813,7 @@ msgstr ""
 "La liste des langues ne contient que les langues pour lesquelles un "
 "dictionnaire a été installé."
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14090,14 +14823,14 @@ msgstr ""
 "signature. Le nom spécifié ne sera utilisé\n"
 "que pour l'affichage. "
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "This option will be overridden if a match for custom junk headers is found."
 msgstr ""
-"Cette option sera surdéfinie si une correspondance avec un en-tête de "
-"pourriel personnalisé est trouvé."
+"Cette option a une priorité plus faible que la détection de pourriels par en-"
+"têtes personnalisés."
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14105,16 +14838,24 @@ msgstr ""
 "Saisissez le nom par lequel vous voulez désigner ce compte.\n"
 "Par exemple : « Travail » ou « Personnel »"
 
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:154
+msgid "Us_ername:"
+msgstr "_Nom d'utilisateur :"
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "Utiliser l'_authentification"
+
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:364
 msgid "User_name:"
 msgstr "_Nom d'utilisateur :"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "_Largeur variable :"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14124,103 +14865,127 @@ msgstr ""
 "\n"
 "Cliquez sur « Suivant » pour commencer. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "A_jouter une signature"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "_Toujours charger les images à partir d'Internet"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr "_URL de configuration  automatique du serveur mandataire :"
+
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "_Greffon pourriel par défaut :"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "Connexion _directe à Internet"
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ne pas signer les de_mandes de réunion (compatibilité Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "Style de _transfert :"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr ""
 "C_onserver la signature au-dessus du message d'origine lors des réponses"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "_Afficher les images dans les messages des contacts"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local addressbook only"
+msgstr "Rechercher seulement dans le carnet d'adresses _local"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "En faire _mon compte par défaut"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr "Configuration _manuelle du serveur mandataire :"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Marquer les messages comme lus après"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Ne jamais charger les images à partir d'Internet"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Chemin :"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:178
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr ""
 "_Demander l'autorisation lors de l'envoi de messages HTML à des contacts qui "
 "n'en veulent pas"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "De_mander lors de l'envoi de messages dépourvus de sujet"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "Style de _réponse  :"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Script :"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr "_Serveur mandataire HTTP sécurisé :"
+
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "_Sélectionner..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "_Afficher les animations"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Afficher la photo de l'expéditeur dans l'aperçu du courriel"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Réduire les en-têtes À / Cc / Cci à"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_Utiliser une connexion sécurisée :"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "_Utiliser les réglages par défaut du système"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Utiliser les mêmes polices que dans les autres applications"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "adresses"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "couleur"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "description"
 
@@ -14268,7 +15033,7 @@ msgstr "Re_chercher :"
 msgid "Find in Message"
 msgstr "Rechercher dans le message"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:279
 msgid "Flag to Follow Up"
 msgstr "Marquer pour donner suite"
 
@@ -14320,7 +15085,7 @@ msgstr "_Marqueur :"
 msgid "_Tick this to accept the license agreement"
 msgstr "Cochez ici pour accepter les _termes de la licence"
 
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping sur %s"
@@ -14367,11 +15132,11 @@ msgstr "Envoi du message %d sur %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Échec lors de l'envoi de %d sur %d messages"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "Annulé."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "Terminé."
 
@@ -14400,66 +15165,71 @@ msgstr "Ouverture du dossier %s"
 
 #: ../mail/mail-ops.c:1270
 #, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "Récupération des informations de quota pour le dossier %s"
+
+#: ../mail/mail-ops.c:1339
+#, c-format
 msgid "Opening store %s"
 msgstr "Ouverture du stockage %s"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1410
 #, c-format
 msgid "Removing folder %s"
 msgstr "Suppression du dossier %s"
 
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1499
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Stockage du dossier « %s »"
 
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1562
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Nettoyage et stockage du compte « %s »"
 
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1563
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Stockage du compte « %s »"
 
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1617
 msgid "Refreshing folder"
 msgstr "Actualisation du dossier"
 
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
 msgid "Expunging folder"
 msgstr "Nettoyage du dossier"
 
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1704
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vidage de la corbeille dans « %s »"
 
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1705
 msgid "Local Folders"
 msgstr "Dossiers locaux"
 
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1786
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Récupération du message %s"
 
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1893
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Récupération de %d message"
 msgstr[1] "Récupération de %d messages"
 
-#: ../mail/mail-ops.c:1906
+#: ../mail/mail-ops.c:1978
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Enregistrement de %d message"
 msgstr[1] "Enregistrement de %d messages"
 
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14468,11 +15238,11 @@ msgstr ""
 "Erreur lors de l'enregistrement des messages vers : %s :\n"
 " %s"
 
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2128
 msgid "Saving attachment"
 msgstr "Enregistrement de la pièce jointe"
 
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14481,51 +15251,51 @@ msgstr ""
 "Impossible de créer le fichier de sortie : %s :\n"
 " %s"
 
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2169
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossible d'écrire les données : %s."
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Déconnexion de %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnexion à %s"
 
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2411
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Préparation du compte « %s  » pour utilisation hors ligne."
 
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2497
 msgid "Checking Service"
 msgstr "Service de vérification"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:182
 msgid "Canceling..."
 msgstr "Annulation..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:385
 msgid "Send & Receive Mail"
 msgstr "Envoi et réception du courriel"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:396
 msgid "Cancel _All"
 msgstr "_Tout annuler"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:505
 msgid "Updating..."
 msgstr "Mise à jour..."
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "Attente..."
 
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "Recherche de nouveau courriel"
@@ -14553,28 +15323,27 @@ msgstr "Saisissez le mot de passe"
 msgid "User canceled operation."
 msgstr "L'utilisateur a annulé l'opération."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Éditer la signature"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "_Enregistrer et fermer"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "Saisissez un nom pour cette signature."
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "Éditer la signature"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "Nom :"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "Nom de la _signature :"
 
 #: ../mail/mail-tools.c:120
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Impossible de créer le dossier spool « %s » : %s"
 
-# ??? je ne comprends pas
 #: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "Essaye de movemail une source non mbox « %s »"
+msgstr "Tentative de movemail d'une source non mbox « %s »"
 
 #: ../mail/mail-tools.c:256
 #, c-format
@@ -14605,55 +15374,50 @@ msgstr "Mise à jour des dossiers de recherche pour « %s:%s »"
 msgid "Updating Search Folders for '%s'"
 msgstr "Mise à jour des dossiers de recherche pour « %s »"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Éditer un dossier de recherche"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Nouveau dossier de recherche"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
-"Un dossier nommé &laquo;&nbsp;{0}&nbsp;&raquo; existe déjà. Veuillez "
-"utiliser un nom différent."
+"Un dossier nommé « {0} » existe déjà. Veuillez utiliser un nom différent."
 
 #: ../mail/mail.error.xml.h:2
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
-"Un dossier nommé &laquo;&nbsp;{1}&nbsp;&raquo; existe déjà. Veuillez "
-"utiliser un nom différent."
+"Un dossier nommé « {1} » existe déjà. Veuillez utiliser un nom différent."
 
 #: ../mail/mail.error.xml.h:3
 msgid ""
-"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"A non-empty folder at \"{1}\" already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 msgstr ""
-"Un dossier non vide existe déjà sur &laquo;&nbsp;{1}&nbsp;&raquo;.\n"
+"Un dossier non vide existe déjà sur « {1} ».\n"
 "\n"
 "Vous pouvez choisir d'ignorer ce dossier, d'écraser ou ajouter son contenu, "
 "ou de quitter."
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr ""
-"Un accusé de réception a été demandé pour la lecture de &laquo;&nbsp;{1}"
-"&nbsp;&raquo;. Voulez-vous envoyer l'accusé de réception à {0}&nbsp;?"
+"Un accusé de réception a été demandé pour la lecture de « {1} ». Voulez-vous "
+"envoyer l'accusé de réception à {0} ?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
 msgstr ""
-"Une signature nommée &laquo;&nbsp;{0}&nbsp;&raquo; existe déjà. Veuillez "
-"utiliser un nom différent."
+"Une signature nommée « {0} » existe déjà. Veuillez indiquer un nom différent."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -14691,7 +15455,7 @@ msgstr ""
 #: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
+"folder \"{0}\"?"
 msgstr ""
 "Voulez-vous vraiment supprimer définitivement tous les messages effacés dans "
 "le dossier « {0} » ?"
@@ -14710,11 +15474,11 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "Voulez-vous vraiment envoyer un message sans sujet ?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
+msgid "Because \"{0}\"."
 msgstr "À cause de « {0} »."
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
+msgid "Because \"{2}\"."
 msgstr "À cause de « {2} »."
 
 #: ../mail/mail.error.xml.h:21
@@ -14722,70 +15486,69 @@ msgid "Blank Signature"
 msgstr "Signature vide"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
+msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Impossible d'ajouter le dossier de recherche « {0} »."
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Impossible de copier le dossier « {0} » vers « {1} »."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Impossible de copier le dossier « {0} » vers « {1} »."
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "Impossible de créer le dossier « {0} »."
+msgid "Cannot create folder \"{0}\"."
+msgstr "Impossible de créer le dossier « {0} »."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "Impossible de créer de dossier de sauvegarde temporaire."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Impossible de créer le dossier de sauvegarde parce que « {1} »"
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
+msgid "Cannot delete folder \"{0}\"."
 msgstr "Impossible de supprimer le dossier « {0} »."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
+msgid "Cannot delete system folder \"{0}\"."
 msgstr "Impossible de supprimer le dossier système « {0} »."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr ""
-"Impossible d'éditer le dossier de recherche « {0} » puisqu'il n'existe pas."
+"Impossible de modifier le dossier de recherche « {0} » puisqu'il n'existe pas."
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Impossible de déplacer le dossier « {0} » vers « {1} »."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
+msgid "Cannot open source \"{1}\""
 msgstr "Impossible d'ouvrir la source « {1} »"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
+msgid "Cannot open source \"{2}\"."
 msgstr "Impossible d'ouvrir la source « {2} »."
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
+msgid "Cannot open target \"{2}\"."
 msgstr "Impossible d'ouvrir la cible « {2} »."
 
 #: ../mail/mail.error.xml.h:34
 msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"license."
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
 msgstr ""
 "Impossible de lire le fichier de licence « {0} » à cause d'un problème "
 "d'installation. Vous ne serez pas capable d'utiliser ce fournisseur jusqu'à "
 "ce que vous acceptiez sa licence."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Impossible de renommer le dossier « {0} » en « {1} »."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "Impossible de renommer « {0} » en « {1} »."
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Impossible de renommer ou déplacer le dossier système « {0} »."
 
 #: ../mail/mail.error.xml.h:37
@@ -14793,18 +15556,22 @@ msgid "Cannot save changes to account."
 msgstr "Impossible d'enregistrer les modifications au compte."
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
+msgid "Cannot save to directory \"{0}\"."
 msgstr "Impossible d'enregistrer dans le dossier « {0} »."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
+msgid "Cannot save to file \"{0}\"."
 msgstr "Impossible d'enregistrer dans le fichier « {0} »."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "Impossible d'utiliser le script de signature « {0} »."
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Impossible de définir le script de signature « {0} »."
 
 #: ../mail/mail.error.xml.h:41
+msgid "Check Junk Failed"
+msgstr "Échec de la détection des pourriels"
+
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14813,49 +15580,42 @@ msgstr ""
 "que beaucoup de mots de passe sont sensibles à la casse ; le verrouillage "
 "majuscules est peut-être actif."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Impossible d'enregistrer le fichier de signature."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
+#: ../mail/mail.error.xml.h:44
+msgid "Delete \"{0}\"?"
 msgstr "Supprimer « {0} » ?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
 msgstr "Supprimer le compte ?"
 
-#: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr ""
-"Supprimer les messages du dossier de recherche &laquo;&nbsp;{0}&nbsp;&raquo;"
-"&nbsp;?"
-
 #: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "Supprimer les messages du dossier de recherche « {0} » ?"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
 msgstr "Supprimer les messages du dossier de recherche ?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "Abandonner les modifications ?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "Ne pas s_upprimer"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "Ne pas supprimer"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "Ne pas désactiver"
 
-#: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr ""
-"Voulez-vous que l'opération soit aussi effectuée dans les sous-dossiers ?"
-
 #: ../mail/mail.error.xml.h:52
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
@@ -14964,36 +15724,27 @@ msgid "Mark all messages as read"
 msgstr "Marquer tous les messages comme lus"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr ""
-"Marquer tous les messages dans ce dossier et ses sous-dossiers comme lus ?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "Dossier manquant."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Aucune source n'a été sélectionnée."
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "Seulement dans le _dossier actuel"
-
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "Ouvrir trop de messages en une fois peut prendre un long moment."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Vérifiez les paramètres de votre compte et essayez à nouveau."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr ""
 "Activez le compte ou bien effectuez l'envoi en utilisant un autre compte."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -15002,7 +15753,7 @@ msgstr ""
 "rechercher des adresses électroniques en cliquant sur le bouton « À : » à "
 "côté de la boîte de saisie."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -15012,35 +15763,43 @@ msgstr ""
 "courriel HTML :\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Saisissez un nom unique pour identifier cette signature."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Veuillez patienter."
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problème lors de la migration de l'ancien dossier de courriel « {0} »."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "Interrogation du serveur"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Questionne le serveur pour obtenir une liste des mécanismes "
 "d'authentification pris en charge."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "Accusé de réception demandé."
 
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Réellement supprimer le dossier « {0} » et tous ses sous-dossiers ?"
+
+#: ../mail/mail.error.xml.h:90
+msgid "Report Junk Failed"
+msgstr "Échec du signalement de pourriel"
+
 #: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "Réellement supprimer le dossier « {0} » et tous ses sous-dossiers ?"
+msgid "Report Not Junk Failed"
+msgstr "Échec du signalement de non pourriel"
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
@@ -15094,28 +15853,28 @@ msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "Les dossiers de recherche suivants :\n"
 "{0}\n"
 "utilisaient le dossier maintenant supprimé :\n"
 "    « {1} »\n"
-"et ont été mis à jour."
+"Ils ont été mis à jour."
 
 #: ../mail/mail.error.xml.h:106
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "Les règles de filtrage suivantes :\n"
 "{0}\n"
 "utilisaient le dossier maintenant supprimé :\n"
 "    « {1} »\n"
-"et ont été mises à jour."
+"Elles ont été mises à jour."
 
 #: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
@@ -15232,9 +15991,9 @@ msgstr ""
 "tous les dossiers locaux, tous les dossiers distants, ou les deux."
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr ""
-"Votre identification sur le serveur « {0} » en temps que « {0} » a échoué."
+"Votre identification sur le serveur « {0} » en tant que « {0} » a échoué."
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -15256,77 +16015,90 @@ msgstr "Ne_ttoyer"
 msgid "_Open Messages"
 msgstr "_Ouvrir les messages"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "dans le dossier actuel et ses _sous-dossiers"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Non vu"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Vu"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Répondu"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1054
+msgid "Forwarded"
+msgstr "Transféré"
+
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Multiples messages non vus"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Messages multiples"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Le plus bas"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Plus bas"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Plus haut"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Le plus haut"
 
-#: ../mail/message-list.c:1614 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Aujourd'hui %H:%M"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %H:%M"
 
-#: ../mail/message-list.c:1642 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: ../mail/message-list.c:1650 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: ../mail/message-list.c:1652 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:3849
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3885 ../mail/message-list.c:4321
 msgid "Generating message list"
 msgstr "Génération de la liste des messages"
 
+#: ../mail/message-list.c:4176
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"Aucun message ne remplit vos critères de recherche. Effacez la recherche "
+"avec le menu Recherche->Effacer ou modifiez les critères."
+
+#: ../mail/message-list.c:4178
+msgid "There are no messages in this folder."
+msgstr "Il n'y a aucun message dans ce dossier."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Date d'échéance"
@@ -15356,39 +16128,39 @@ msgstr "Messages envoyés"
 msgid "Size"
 msgstr "Taille"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Appel"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "Ne pas faire suivre"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "Donner suite"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Pour votre information"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Faire suivre"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "Aucune réponse nécessaire"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Répondre"
 
-#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Répondre à tous"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Revoir"
 
@@ -15425,14 +16197,6 @@ msgid "Provides core functionality for local address books."
 msgstr "Fournit la fonctionnalité à la base des carnets d'adresses locaux."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "Active le greffon d'oubli des pièces jointes"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "Active le greffon d'oubli des pièces jointes."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -15440,7 +16204,7 @@ msgstr ""
 "Liste d'indices que le greffon d'oubli des pièces jointes doit rechercher "
 "dans le corps d'un message"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
@@ -15448,14 +16212,11 @@ msgstr ""
 "Liste d'indices que le greffon d'oubli des pièces jointes doit rechercher "
 "dans le corps d'un message."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Mots-clés"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "Signaler les pièces jointes _manquantes"
-
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
 msgid "Attachment Reminder"
@@ -15481,9 +16242,9 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "Message sans pièce jointe"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "_Continuer l'édition"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
+msgstr "É_diter le message"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
@@ -15497,27 +16258,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Greffon audio"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:107
 msgid "Select name of the Evolution backup file"
 msgstr "Sélectionnez le nom de l'archive Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:136
 msgid "_Restart Evolution after backup"
 msgstr "_Redémarrer Evolution après l'archivage"
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:159
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Sélectionnez le nom de l'archive d'Evolution à restaurer"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after restore"
 msgstr "_Redémarrer Evolution après la restauration"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:256
 msgid "Restore from backup"
 msgstr "Restaurer à partir de l'archive"
 
-#: ../plugins/backup-restore/backup-restore.c:238
+#: ../plugins/backup-restore/backup-restore.c:258
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. \n"
@@ -15528,98 +16289,124 @@ msgstr ""
 "Il restaure également tous vos paramètres personnels, filtres de courriel, "
 "etc."
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurer Evolution à partir de l'archive"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:271
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Sélectionnez une archive d'Evolution pour la restauration :"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:274
 msgid "Choose a file to restore"
 msgstr "Choisissez un fichier à restaurer"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "Répertoire d'archive d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "Répertoire de restauration d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "Contrôle l'archive Evolution"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "Redémarre Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr "Avec interface graphique"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "Ferme Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "Archivage des comptes et des paramètres d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Archivage des données d'Evolution (courriels, contacts, calendriers, tâches "
 "et mémos)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "Archivage terminé"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "Redémarrage d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "Archiver les données actuelles d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "Extraction des fichiers de l'archive"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "Chargement des paramètres d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "Suppression des fichiers d'archive temporaires"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr "Contrôle des sources locales"
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Archivage vers le dossier %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restauration depuis le dossier %s"
 
 # Titre
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "Archivage d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "Restauration d'Evolution"
 
+#: ../plugins/backup-restore/backup.c:494
+msgid "Backing up Evolution Data"
+msgstr "Archivage des données d'Evolution"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Veuillez attendre qu'Evolution finisse d'archiver vos données."
+
+#: ../plugins/backup-restore/backup.c:497
+msgid "Restoring Evolution Data"
+msgstr "Restauration des données d'Evolution"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Veuillez attendre qu'Evolution finisse de restaurer vos données."
+
+#: ../plugins/backup-restore/backup.c:516
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+"Ceci peut prendre du temps, en fonction de la quantité de données de votre "
+"compte."
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
@@ -15654,14 +16441,24 @@ msgstr ""
 "redémarre automatiquement après l'archivage, activez l'option correspondante."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Insufficient Permissions"
+msgstr "Permissions insuffisantes"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "Le fichier d'archive Evolution est non valide"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "Sélectionnez un fichier d'archive valide pour la restauration."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "The selected folder does not have enough permissions to create the file"
+msgstr ""
+"Le dossier sélectionné ne dispose pas des droits nécessaires pour créer le "
+"fichier"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
 "This will delete all your current Evolution data and settings and restore "
 "them from your backup. Evolution restore can start only when Evolution is "
@@ -15741,7 +16538,29 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "Erreur pendant le lancement de %s : %s."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr "Le processus fils Bogofilter ne répond pas, il va être tué..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+"En attente du processus fils Bogofilter interrompu, terminaison en cours..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr "Échec du tube vers Bogofilter, code erreur : %d."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr "Convertir le texte du message en _Unicode"
 
@@ -15762,6 +16581,10 @@ msgid "Bogofilter Options"
 msgstr "Options de Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "Greffon pourriel Bogofilter"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filtre les pourriels en utilisant Bogofilter."
 
@@ -15770,12 +16593,12 @@ msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:135
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL :"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:351
+#: ../plugins/google-account-setup/google-source.c:357
 msgid "Use _SSL"
 msgstr "Utiliser _SSL"
 
@@ -15795,17 +16618,17 @@ msgstr "Calendriers locaux"
 msgid "Provides core functionality for local calendars."
 msgstr "Fournit la fonctionnalité à la base des calendriers locaux."
 
-#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:375
-msgid "_Refresh:"
-msgstr "_Actualiser :"
+#: ../plugins/google-account-setup/google-source.c:381
+msgid "Re_fresh:"
+msgstr "Ac_tualiser :"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "Connexion _sécurisée"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "_Nom d'utilisateur :"
 
@@ -15907,14 +16730,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Voulez-vous faire d'Evolution votre client de messagerie par défaut ?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:690
+#: ../shell/main.c:679
 msgid "Evolution"
 msgstr "Evolution"
 
 #: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "Marquer comme dossier par _défaut"
+msgid "Mark as _default address book"
+msgstr "Marquer comme carnet d'adresses par _défaut"
+
+#: ../plugins/default-source/default-source.c:102
+msgid "Mark as _default calendar"
+msgstr "Marquer comme calendrier par _défaut"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default task list"
+msgstr "Marquer comme liste de tâches par _défaut"
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default memo list"
+msgstr "Marquer comme liste de mémos par _défaut"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -15928,6 +16762,56 @@ msgstr ""
 "Fournit la fonctionnalité permettant de marquer un calendrier ou un carnet "
 "d'adresses comme celui par défaut."
 
+#: ../plugins/email-custom-header/email-custom-header.c:562
+msgid "_Custom Header"
+msgstr "_En-tête personnalisé"
+
+#: ../plugins/email-custom-header/email-custom-header.c:883
+msgid "Key"
+msgstr "Clé"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Valeurs"
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+"Le format de définition d'un en-tête personnalisé est :\n"
+"Nom de l'en-tête personnalisé clé valeurs séparées par « ; »."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr "En-tête de courriel personnalisé"
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Adds custom header to outgoing messages."
+msgstr "Ajoute un en-tête personnalisé aux messages sortants."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "En-tête personnalisé"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Header"
+msgstr "Liste d'en-têtes personnalisés"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"Cette clé fournit la liste des en-têtes personnalisés que vous pouvez "
+"ajouter à un message sortant. Le format pour spécifier un en-tête et sa "
+"valeur est : nom de l'en-tête personnalisé suivi de « = », les valeurs sont "
+"séparées par des « ; »"
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Ouvrir le dossier d'un autre utilisateur"
@@ -15945,12 +16829,12 @@ msgid "_User:"
 msgstr "Nom d'_utilisateur :"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "Mot de passe sécurisé"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -15958,11 +16842,11 @@ msgstr ""
 "Cette option utilisera l'authentification par mot de passe sécurisé (NTLM) "
 "pour se connecter au serveur Exchange."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "Mot de passe en texte brut"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -15970,11 +16854,11 @@ msgstr ""
 "Cette option utilisera un mot de passe en texte brut standard pour se "
 "connecter au serveur Exchange."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Absent du bureau"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -15983,77 +16867,81 @@ msgstr ""
 "vous\n"
 "envoyant du courriel pendant votre absence du bureau."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "Je suis actuellement absent du bureau"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "Je suis actuellement au bureau"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Changer le mot de passe pour le compte Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Gère les paramètres de délégation pour un compte Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "Assistant de délégation"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Divers"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "Voir la taille de tous les dossiers Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Taille des dossiers"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Paramètres d'Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:674
 msgid "_OWA URL:"
 msgstr "URL _OWA :"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:700
 msgid "A_uthenticate"
 msgstr "S'a_uthentifier"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:721
+msgid "_Mailbox:"
+msgstr "_Boîte aux lettres :"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:922
 msgid "_Authentication Type"
 msgstr "Type d'_authentification"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "Ch_eck for Supported Types"
 msgstr "_Vérifier les types pris en charge"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1048
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s Kio"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:1050
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -16072,7 +16960,7 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
+#: ../plugins/exchange-operations/exchange-change-password.c:113
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
@@ -16080,7 +16968,7 @@ msgstr ""
 "Ce mot de passe est différent du mot de passe existant pour votre compte. "
 "Veuillez saisir le bon mot de passe."
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:120
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Les deux mots de passe sont différents. Veuillez les saisir à nouveau."
 
@@ -16107,33 +16995,33 @@ msgstr ""
 msgid "Your password will expire in the next %d days"
 msgstr "Votre mot de passe expirera dans les %d prochains jours"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Éditeur (lire, créer, éditer)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Auteur (lire, créer)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Relecteur (lecture-seule)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Permissions du délégué"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "Permissions pour %s"
@@ -16141,7 +17029,7 @@ msgstr "Permissions pour %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -16152,66 +17040,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 msgid "You have been given the following permissions on my folders:"
 msgstr "Vous avez reçu les permissions suivantes sur mes dossiers :"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
 msgstr "Vous avez aussi le droit de consulter mes éléments privés."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr "Cependant, vous n'êtes pas autorisé à consulter mes éléments privés."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Vous avez été désigné comme délégué de %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To"
 msgstr "Déléguer à"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:580
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Supprimer le délégué %s ?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "Impossible d'accéder à Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Impossible de se trouver soi-même dans l'Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Impossible de trouver le délégué %s dans l'Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Impossible de supprimer le délégué %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "Impossible de mettre à jour la liste des délégués."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Impossible d'ajouter le délégué %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:981
 msgid "Error reading delegates list."
 msgstr "Erreur lors de la lecture de la liste des délégués."
 
@@ -16260,20 +17148,25 @@ msgstr "_Résumer les permissions"
 msgid "_Tasks:"
 msgstr "_Tâches :"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:59
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Permissions..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
 msgid "Folder Name"
 msgstr "Nom du dossier"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
 msgid "Folder Size"
 msgstr "Taille du dossier"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+msgid "User"
+msgstr "Utilisateur"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "S'abonner à un dossier d'un autre utilisateur"
@@ -16282,20 +17175,20 @@ msgstr "S'abonner à un dossier d'un autre utilisateur"
 msgid "Exchange Folder Tree"
 msgstr "Arborescence des dossiers Exchange"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:235
-#: ../plugins/exchange-operations/exchange-folder.c:245
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:234
+#: ../plugins/exchange-operations/exchange-folder.c:244
 msgid "Unsubscribe Folder..."
 msgstr "Se désabonner du dossier..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:519
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Voulez-vous vraiment vous désabonner du dossier « %s » ?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:531
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Se désabonner du dossier « %s »"
@@ -16360,15 +17253,18 @@ msgstr "Votre mot de passe expirera dans 7 jours..."
 msgid "_Change Password"
 msgstr "_Changer le mot de passe"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(Permission refusée)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
 msgid "Add User:"
 msgstr "Ajouter un utilisateur :"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../plugins/groupwise-features/proxy.c:934
+#: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
 msgstr "Ajouter un utilisateur"
 
@@ -16490,11 +17386,11 @@ msgstr "_Utilisateur"
 msgid "button-user"
 msgstr "bouton utilisateur"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Sélectionner un utilisateur"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "Carnet d'adresses..."
 
@@ -16508,10 +17404,10 @@ msgstr "S'abonner au calendrier d'un autre utilisateur"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
 msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
+"A plugin that manages a collection of Exchange account specific operations "
 "and features."
 msgstr ""
-"Un greffon qui gère diffférentes opérations et fonctionnalités spécifiques "
+"Un greffon qui gère différentes opérations et fonctionnalités spécifiques "
 "aux comptes Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
@@ -16603,10 +17499,16 @@ msgid "Could not update out-of-office state"
 msgstr "Impossible de mettre à jour l'état « Absent du bureau »"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+"Evolution doit être redémarré pour charger la boîte aux lettres de "
+"l'utilisateur abonné"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "Le compte Exchange est hors ligne."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16635,32 +17537,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Impossible de mettre à jour les délégués :"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Le dossier existe déjà"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Le dossier n'existe pas"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Dossier hors ligne"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "Erreur générique"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "Le serveur de catalogue global n'est pas accessible"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -16668,78 +17570,78 @@ msgstr ""
 "Si OWA s'exécute dans un chemin différent, vous devez le spécifier dans la "
 "configuration du compte."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "La boîte à lettres de {0} n'est pas sur ce serveur."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "Vérifiez que l'URL est correcte et essayer à nouveau."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 "Vérifiez que le nom du serveur est correctement orthographié et essayez à "
 "nouveau."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 "Vérifiez que l'identifiant et le mot de passe sont corrects et essayez à "
 "nouveau."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "Aucun catalogue global configuré pour ce compte."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "Aucune boîte à lettres pour l'utilisateur {0} on {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Aucun utilisateur {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "Le mot de passe a bien été modifié."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 "Saisissez un ID de délégué ou décochez l'option « Envoyer en tant que "
 "délégué »."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Assurez-vous que le nom du Serveur Global Catalog est correct."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Redémarrez Evolution pour que les modifications prennent effet."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Sélectionnez un utilisateur."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "Le serveur a refusé le mot de passe car celui-ci est trop faible."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Le compte Exchange sera désactivé lorsque vous quitterez Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Le compte Exchange sera supprimé quand vous quitterez Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr ""
 "Le serveur Exchange n'est pas compatible avec votre connecteur Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -16747,7 +17649,7 @@ msgstr ""
 "Le serveur exécute Exchange 5.5. Le connecteur Exchange prend uniquement en "
 "charge Microsoft Exchange 2000 et 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -16762,61 +17664,61 @@ msgstr ""
 "Il est aussi possible que vous ayez saisi un mauvais\n"
 "mot de passe."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "Essayer à nouveau avec un mot de passe différent."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "Impossible d'ajouter l'utilisateur à la liste de contrôle d'accès :"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Impossible d'éditer les délégués."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Erreur inconnue lors de la recherche de {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error."
 msgstr "Erreur inconnue."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Type inconnu"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Opération non gérée"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "La capacité occupée par le stockage de vos courriels est proche de la limite "
 "qui vous est autorisée sur ce serveur."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr "Vous ne pouvez pas envoyer de message au nom de plus d'une personne."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "Vous ne pouvez pas faire de vous-même votre propre délégué"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr ""
 "Vous avez dépassé la capacité de stockage qui vous est autorisée sur ce "
 "serveur pour vos courriels."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "Vous ne pouvez configurer qu'un seul compte Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -16824,7 +17726,7 @@ msgstr ""
 "Votre utilisation actuelle est {0} Kio. Essayez de libérer un peu d'espace "
 "en supprimant quelques courriels."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -16832,7 +17734,7 @@ msgstr ""
 "Votre utilisation actuelle est {0} Kio. Vous ne serez plus en mesure "
 "d'envoyer ou de recevoir des courriels."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -16841,19 +17743,19 @@ msgstr ""
 "d'envoyer ou de recevoir des courriels tant que vous n'aurez pas libérer de "
 "l'espace en supprimant quelques courriels."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "Votre mot de passe a expiré."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} ne peut pas être ajouté à une liste de contrôle d'accès"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} est déjà une délégation"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} est déjà dans la liste"
 
@@ -16865,6 +17767,14 @@ msgstr "S'abonner aux tâches d'un autre utilisateur"
 msgid "Check folder permissions"
 msgstr "Contrôler les droits du dossier"
 
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "Éditeur externe par défaut"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr "La commande à utiliser par défaut pour lancer l'éditeur."
+
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
 "A plugin for using an external editor as the composer. You can send only "
@@ -16878,6 +17788,30 @@ msgstr ""
 msgid "External Editor"
 msgstr "Éditeur externe"
 
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "Impossible de créer des fichiers temporaires"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr "Impossible de lancer l'éditeur"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr ""
+"Evolution n'a pas pu créer un fichier temporaire pour enregistrer votre "
+"courriel. Essayez plus tard."
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"Impossible de lancer l'éditeur externe paramétré dans vos préférences de "
+"greffons. Essayez de choisir un autre éditeur."
+
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
 msgid "Compose in External Editor"
 msgstr "Édition dans un éditeur externe"
@@ -16886,15 +17820,27 @@ msgstr "Édition dans un éditeur externe"
 msgid "Compose messages using an external editor"
 msgstr "Édite les messages en utilisant un éditeur externe"
 
-#: ../plugins/face/face.c:57
+#: ../plugins/external-editor/external-editor.c:91
+msgid "Command to be executed to launch the editor: "
+msgstr "Commande à exécuter pour lancer l'éditeur : "
+
+#: ../plugins/external-editor/external-editor.c:92
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+"Pour Emacs, indiquez « xemacs »\n"
+"pour VI, indiquez « gvim »"
+
+#: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Sélectionnez une image PNG (48x48) de taille inférieure à 700 octets"
 
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:68
 msgid "PNG files"
 msgstr "Fichiers PNG"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:125
 msgid "_Face"
 msgstr "_Portrait"
 
@@ -16933,20 +17879,35 @@ msgstr "Se désabonner des dossiers"
 msgid "_Unsubscribe"
 msgstr "Se _désabonner"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:73
+#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+msgid "<b>Server</b>"
+msgstr "<b>Serveur</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+msgid "Username:"
+msgstr "Nom d'utilisateur :"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:230
+msgid "Update every"
+msgstr "Mettre à jour tous les"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "Un greffon pour configurer un calendrier Google."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "Un greffon pour configurer un calendrier et des contacts Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Sources Google"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
 msgstr "Liste de contrôle"
 
@@ -17027,10 +17988,22 @@ msgid "_Junk List"
 msgstr "_Liste des pourriels"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr "Rétractation du message"
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+"Il se peut que le retrait d'un message l'efface de la boîte aux lettres des "
+"destinataires. Êtes-vous sûr de vouloir faire cela ?"
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr "Message rétracté avec succès"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "Rétractation du courriel"
 
@@ -17038,12 +18011,6 @@ msgstr "Rétractation du courriel"
 msgid "Add Send Options to groupwise messages"
 msgstr "Ajouter les options d'envoi au messages GroupWise"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Options d'envoi"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Un greffon pour les fonctionnalités des comptes GroupWise."
@@ -17052,6 +18019,72 @@ msgstr "Un greffon pour les fonctionnalités des comptes GroupWise."
 msgid "Groupwise Features"
 msgstr "Fonctionnalités de GroupWise"
 
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+msgid "Message retract failed"
+msgstr "Échec de la rétractation du message"
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+msgid "The server did not allow the selected message to be retracted."
+msgstr "Le serveur ne permet pas la rétractation du message sélectionné."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+msgid "Invalid user"
+msgstr "Utilisateur non valide"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "Impossible de donner l'accès proxy à l'utilisateur « {0} »"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+msgid "Specify User"
+msgstr "Indiquer un utilisateur"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+msgid "You have already given proxy permissions to this user."
+msgstr "Vous avez déjà donné des permissions proxy à cet utilisateur."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr ""
+"Vous devez indiquer un nom d'utilisateur valide pour donner des droits proxy."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr ""
+"Le compte « {0} » existe déjà. Veuillez vérifier votre arborescence de "
+"dossiers."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+msgid "Account Already Exists"
+msgstr "Compte déjà existant"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
+"try again."
+msgstr ""
+"Echec de la connexion proxy en tant que « {0} ». Veuillez vérifier "
+"l'identificateur du courriel et essayez à nouveau."
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr "Ceci est une réunion récurrente"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+msgid "What would you like to {0}?"
+msgstr "Que voulez-vous {0} ?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "Impossible de partager le dossier avec l'utilisateur spécifié « {0} »"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You have to specify a user name whom you want to add to the list"
+msgstr "Vous devez indiquer un nom d'utilisateur à ajouter à la liste"
+
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
 msgstr "Accepter provisoirement"
@@ -17150,9 +18183,9 @@ msgstr "<b>Nom du compte</b>"
 msgid "Proxy Login"
 msgstr "Identification sur le proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -17161,21 +18194,21 @@ msgstr "%sSaisissez le mot de passe pour %s (utilisateur %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:521
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "_Identification sur le proxy..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "L'onglet proxy sera accessible seulement lorsque le compte sera en ligne."
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "L'onglet proxy sera accessible seulement lorsque le compte sera actif."
 
 #: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Utilisateurs"
 
@@ -17191,11 +18224,15 @@ msgstr "Nouveau dossier _partagé..."
 msgid "Sharing"
 msgstr "Partage"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "Notification personnalisée"
+
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "Ajouter"
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "Modifier"
 
@@ -17260,11 +18297,11 @@ msgstr "Un greffon pour configurer les sources de calendrier Hula."
 msgid "Hula Account Setup"
 msgstr "Configuration d'un compte Hula"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "En-têtes personnalisés"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "En-têtes IMAP"
 
@@ -17319,28 +18356,28 @@ msgstr "Un greffon pour les fonctionnalités des comptes IMAP."
 msgid "IMAP Features"
 msgstr "Fonctionnalités IMAP"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "_Importer dans le calendrier"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "_Importer dans les tâches"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "Importer ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "Sélectionner une liste de tâches"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "Sélectionner un calendrier"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:263
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../shell/e-shell-importer.c:700
 msgid "_Import"
 msgstr "_Importer"
 
@@ -17378,8 +18415,8 @@ msgstr ""
 "Evolution n'a pas pu trouver un iPod avec lequel se synchroniser. Soit "
 "l'iPod n'est pas connecté au système ou bien il n'est pas allumé."
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "Format iCalendar (.ics)"
 
@@ -17434,95 +18471,95 @@ msgstr "Impossible de trouver ce mémo dans une liste"
 msgid "Searching for an existing version of this appointment"
 msgstr "Recherche d'une version existante de ce rendez-vous"
 
-#: ../plugins/itip-formatter/itip-formatter.c:943
+#: ../plugins/itip-formatter/itip-formatter.c:946
 msgid "Unable to parse item"
 msgstr "Impossible d'analyser le contenu de l'élément"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1004
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Impossible d'envoyer l'élément au calendrier « %s ». %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1013
+#: ../plugins/itip-formatter/itip-formatter.c:1016
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "« %s » a été envoyée au calendrier comme acceptée"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "« %s » a été envoyée au calendrier comme provisoire"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1022
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "« %s » a été envoyée calendrier comme refusée"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1027
+#: ../plugins/itip-formatter/itip-formatter.c:1030
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "« %s » a été envoyée au calendrier comme annulée"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1121
+#: ../plugins/itip-formatter/itip-formatter.c:1124
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "L'organisateur a supprimé la délégation %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1131
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Envoie un avis d'annulation à la délégation"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Impossible d'envoyer l'avis d'annulation au délégué"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1219
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "L'état du participant n'a pas pu être mis à jour car l'état n'est pas valide"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1243
+#: ../plugins/itip-formatter/itip-formatter.c:1246
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Impossible de mettre à jour le participant. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1247
+#: ../plugins/itip-formatter/itip-formatter.c:1250
 msgid "Attendee status updated"
 msgstr "État du participant mis à jour"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1276
 msgid "Meeting information sent"
 msgstr "Les informations de la réunion ont été envoyées"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid "Task information sent"
 msgstr "Les informations de la tâche ont été envoyées"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1282
 msgid "Memo information sent"
 msgstr "Les informations du mémo ont été envoyées"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1288
+#: ../plugins/itip-formatter/itip-formatter.c:1291
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 "Impossible d'envoyer les informations de la réunion, celle-ci n'existe pas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1294
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 "Impossible d'envoyer les informations de la tâche, celle-ci n'existe pas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1297
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Impossible d'envoyer les informations du mémo, celui-ci n'existe pas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1369
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid "The calendar attached is not valid"
 msgstr "Le calendrier joint n'est pas valide"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1370
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../plugins/itip-formatter/itip-formatter.c:1367
+#: ../plugins/itip-formatter/itip-formatter.c:1378
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17530,15 +18567,15 @@ msgstr ""
 "Le message prétend contenir un calendrier, mais celui-ci n'est pas dans un "
 "format iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1420
-#: ../plugins/itip-formatter/itip-formatter.c:1438
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "The item in the calendar is not valid"
 msgstr "L'élément dans le calendrier n'est pas valide"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-#: ../plugins/itip-formatter/itip-formatter.c:1439
-#: ../plugins/itip-formatter/itip-formatter.c:1521
+#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1437
+#: ../plugins/itip-formatter/itip-formatter.c:1519
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17546,11 +18583,11 @@ msgstr ""
 "Le message contient un calendrier, mais celui-ci ne contient aucun "
 "événement, tâche ou information libre/occupé"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1450
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "The calendar attached contains multiple items"
 msgstr "Le calendrier joint contient des éléments multiples"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17558,233 +18595,233 @@ msgstr ""
 "Pour traiter tous ces éléments, le fichier devra être enregistré et le "
 "calendrier importé"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "Cette réunion est récurrente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "Cette tâche est récurrente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "Ce mémo est récurrent"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2369
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "_Supprimer le message après intervention"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2379
-#: ../plugins/itip-formatter/itip-formatter.c:2411
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "Recherche de conflit"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Sélectionnez les calendriers où chercher les conflits de réunions"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "Aujourd'hui"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:195
 msgid "Today %H:%M"
 msgstr "Aujourd'hui %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:199
 msgid "Today %H:%M:%S"
 msgstr "Aujourd'hui %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:208
 msgid "Today %l:%M:%S %p"
 msgstr "Aujourd'hui %I:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:218
 msgid "Tomorrow"
 msgstr "Demain"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow %H:%M"
 msgstr "Demain %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:227
 msgid "Tomorrow %H:%M:%S"
 msgstr "Demain %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %l:%M %p"
 msgstr "Demain %I:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:236
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Demain %I:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../plugins/itip-formatter/itip-view.c:255
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:260
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:266
+#: ../plugins/itip-formatter/itip-view.c:264
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %l:%M %p"
 msgstr "%A %I:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:275
+#: ../plugins/itip-formatter/itip-view.c:273
 msgid "%A %l:%M:%S %p"
 msgstr "%A %I:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e"
 msgstr "%A %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:288
 msgid "%A, %B %e %H:%M"
 msgstr "%A %e %B, %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:292
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A %e %B, %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A %e %B, %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A %e %B, %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:307
 msgid "%A, %B %e, %Y"
 msgstr "%A %e %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A %e %B %Y, %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:316
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A %e %B %Y, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A %e %B %Y, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:325
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A %e %B %Y, %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:526
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Veuillez répondre par délégation de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Reçu par délégation de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:357
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a publié les informations de la réunion "
 "suivantes :"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:359
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> a publié les informations de la réunion suivantes :"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> vous a délégué la réunion suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s demande votre présence à la réunion "
 "suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> demande votre présence à la réunion suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:375
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s souhaite être intégré à une réunion "
 "existante :"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:377
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> souhaite être intégré à une réunion existante :"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17793,7 +18830,7 @@ msgstr ""
 "<b>%s</b> par l'intermédiaire de %s souhaite recevoir les dernières "
 "informations pour la réunion suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
@@ -17801,90 +18838,90 @@ msgstr ""
 "<b>%s</b> souhaite recevoir les dernières informations pour la réunion "
 "suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:387
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a envoyé la réponse à une réunion "
 "suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:389
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> a envoyé la réponse à une réunion suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:393
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> par l'intermédiaire de %s a annulé la réunion suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:395
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> a annulé la réunion suivante."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:399
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a proposé les changements suivants à la "
 "réunion."
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:401
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> a proposé les changements suivants à la réunion."
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:405
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a refusé les changements suivants à la "
 "réunion :"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:407
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> a refusé les changements suivants de la réunion."
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:445
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> par l'intermédiaire de %s a publié les tâches suivantes :"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> a publié la tâche suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> demande l'attribution à %s de la tâche suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:455
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> par l'intermédiaire de %s vous a attribué une tâche :"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> vous a attribué une tâche :"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:463
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s souhaite être intégré à une tâche "
 "existante :"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:465
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> souhaite être intégré à une tâche existante :"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17893,7 +18930,7 @@ msgstr ""
 "<b>%s</b> par l'intermédiaire de %s souhaite recevoir les dernières "
 "informations pour l'attribution de tâche suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:471
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -17902,7 +18939,7 @@ msgstr ""
 "<b>%s</b> souhaite recevoir les dernières informations pour l'attribution de "
 "tâche suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:475
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
@@ -17910,23 +18947,23 @@ msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a renvoyé une réponse à la tâche "
 "attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:477
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> a renvoyé une réponse à la tâche attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:481
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a annulé la tâche attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:483
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> a annulé la tâche attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:487
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
@@ -17934,145 +18971,145 @@ msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a proposé les changements suivants à "
 "l'attribution de tâche :"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:489
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 "<b>%s</b> a proposé les changements suivants à l'attribution de tâche :"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:493
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s a refusé la tâche attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:495
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> a refusé la tâche attribuée suivante :"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:533
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> par l'intermédiaire de %s a publié le mémo suivant :"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> a publié le mémo suivant :"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:540
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr ""
 "<b>%s</b> par l'intermédiaire de %s souhaite être intégré à mémo existant :"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> souhaite être intégré à un mémo existant :"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> par l'intermédiaire de %s a annulé le mémo partagé suivant :"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> a annulé le mémo partagé suivant :"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:819
 msgid "_Open Calendar"
 msgstr "_Ouvrir un calendrier"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:852
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Decline"
 msgstr "_Refuser"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:826
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Accept"
 msgstr "_Accepter"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Decline all"
 msgstr "Tout _refuser"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Tentative all"
 msgstr "Tout _provisoire"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:836
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Tentative"
 msgstr "_Provisoire"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Accept all"
 msgstr "Tout _accepter"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Send Information"
 msgstr "_Envoyer l'information"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Update Attendee Status"
 msgstr "Mettre à jo_ur l'état du participant"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:849
 msgid "_Update"
 msgstr "_Mettre à jour"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1010
 msgid "Start time:"
 msgstr "Heure de début :"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../plugins/itip-formatter/itip-view.c:1019
 msgid "End time:"
 msgstr "Heure de fin :"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../plugins/itip-formatter/itip-view.c:1085
 msgid "Comment:"
 msgstr "Commentaire :"
 
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1071
 msgid "Send _reply to sender"
 msgstr "Ré_pondre à l'expéditeur"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1099
 msgid "Send _updates to attendees"
 msgstr "Envoyer des _mises à jour aux participants"
 
-#: ../plugins/itip-formatter/itip-view.c:1110
+#: ../plugins/itip-formatter/itip-view.c:1108
 msgid "_Apply to all instances"
 msgstr "_Appliquer à toutes les occurrences"
 
-#: ../plugins/itip-formatter/itip-view.c:1119
+#: ../plugins/itip-formatter/itip-view.c:1117
 msgid "Show time as _free"
 msgstr "Afficher la période comme _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Tasks :"
 msgstr "_Tâches :"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "Memos :"
 msgstr "Mémos :"
 
@@ -18144,8 +19181,7 @@ msgstr ""
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
-msgstr ""
-"Avertit uniquement de nouveaux messages dans la « Boîte de réception »."
+msgstr "Avertit uniquement de nouveaux messages dans la « Boîte de réception »."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Play sound when new messages arrive."
@@ -18193,12 +19229,20 @@ msgstr ""
 "Indique s'il faut avertir seulement de la réception de nouveaux messages "
 "dans la « Boîte de réception »."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "Générer un message _D-Bus"
 
+#: ../plugins/mail-notification/mail-notification.c:361
+msgid "Evolution's Mail Notification"
+msgstr "Notification de courriel d'Evolution"
+
+#: ../plugins/mail-notification/mail-notification.c:382
+msgid "Mail Notification Properties"
+msgstr "Propriétés des notifications de courriel"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:440
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18213,55 +19257,55 @@ msgstr[1] ""
 "Vous avez reçu %d nouveaux messages\n"
 "dans %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:445
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Vous avez reçu %d nouveau message."
 msgstr[1] "Vous avez reçu %d nouveaux messages."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:462
 msgid "New email"
 msgstr "Nouveau courriel"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:519
 msgid "Show icon in _notification area"
 msgstr "Afficher une icône dans la zone de _notification"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:522
 msgid "B_link icon in notification area"
 msgstr "Icône c_lignotante dans la zone de notification"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:524
 msgid "Popup _message together with the icon"
 msgstr "_Message contextuel avec l'icône"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:705
 msgid "_Play sound when new messages arrive"
 msgstr "_Jouer un son à la réception d'un nouveau message"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:711
 msgid "_Beep"
 msgstr "_Bip"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:712
 msgid "Play _sound file"
 msgstr "Jouer un fichier _son"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:723
 msgid "Specify _filename:"
 msgstr "Indiquez le nom du _fichier :"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:724
 msgid "Select sound file"
 msgstr "Sélection d'un fichier sonore"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:725
 msgid "Pl_ay"
 msgstr "_Jouer"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:782
 msgid "Notify new messages for _Inbox only"
 msgstr "Avertir uniquement des nouveaux messages de la « Boîte de réception »"
 
@@ -18411,7 +19455,7 @@ msgstr "Envoyer un message électronique à la liste ?"
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -18500,6 +19544,28 @@ msgstr "S'_abonner à la liste"
 msgid "_Unsubscribe from List"
 msgstr "Se _désabonner de la liste"
 
+#: ../plugins/mark-all-read/mark-all-read.c:37
+msgid "Mark all messages in this folder and subfolders as read?"
+msgstr ""
+"Marquer tous les messages dans ce dossier et ses sous-dossiers comme lus ?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+msgid "Do you want the operation to be performed also in the subfolders?"
+msgstr ""
+"Voulez-vous que l'opération soit aussi effectuée dans les sous-dossiers ?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:85
+msgid "Mark All Messages as Read"
+msgstr "Marquer tous les messages comme lus"
+
+#: ../plugins/mark-all-read/mark-all-read.c:162
+msgid "Current Folder and _Subfolders"
+msgstr "Dossier actuel et _sous-dossiers"
+
+#: ../plugins/mark-all-read/mark-all-read.c:174
+msgid "Current _Folder Only"
+msgstr "Seulement le _dossier actuel"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Tout marquer comme lu"
@@ -18542,7 +19608,7 @@ msgstr "Un greffon pour gérer quels greffons sont actifs ou pas."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "Gestionnaire de greffons"
 
@@ -18554,33 +19620,24 @@ msgstr "Active et désactive les greffons"
 msgid "_Plugins"
 msgstr "_Greffons"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:42
 msgid "Author(s)"
 msgstr "Auteur(s)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Description"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "Configuration"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Note : certains changements ne prendront effet qu'après un redémarrage"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
 msgstr "Vue d'ensemble"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "Configuration"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "Il n'y a pas d'option de configuration pour ce greffon."
-
-#: ../plugins/plugin-manager/plugin-manager.c:330
-#: ../plugins/plugin-manager/plugin-manager.c:392
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "Greffon"
 
@@ -18607,41 +19664,22 @@ msgstr "Mode texte simple"
 msgid "Prefer plain-text"
 msgstr "Préférer le texte simple"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
 msgstr "Afficher au format HTML si présent"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
 msgstr "Préférer le format PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:176
 msgid "Only ever show PLAIN"
 msgstr "Afficher toujours au format PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:219
 msgid "HTML _Mode"
 msgstr "_Mode HTML"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr "Fournit une option pour imprimer depuis l'éditeur."
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "Imprimer le message"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "_Aperçu avant impression"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "Imprime le message"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "Profiler d'Evolution"
@@ -18666,13 +19704,7 @@ msgstr "Emplacements"
 msgid "_Publish Calendar Information"
 msgstr "_Publier l'information Calendar"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "Saisissez le mot de passe pour « %s »"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "Voulez-vous vraiment supprimer cette URL ?"
 
@@ -18760,15 +19792,76 @@ msgstr ""
 "iCal\n"
 "Libre/Occupé"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Bonjour Python"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Tests du chargeur de greffons Python"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Greffon de test Python"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Greffon de test pour le chargeur Python EPlugin."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr "Un greffon qui charge d'autres greffons écrits en Python."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "Chargeur Python"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (intégré)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
-msgid "This will make Spamassasin more reliable, but slower"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "SpamAssassin non trouvé, code : %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, c-format
+msgid "Failed to create pipe: %s"
+msgstr "Impossible de créer le tube : %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, c-format
+msgid "Error after fork: %s"
+msgstr "Erreur après le clonage : %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr "Le processus fils SpamAssassin ne répond pas, il va être tué..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+"En attente du processus fils Spamassassin interrompu, terminaison en cours..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr "Échec du tube vers SpamAssassin, code erreur : %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr "SpamAssassin n'est pas disponible."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Cela rendra SpamAssassin plus fiable, mais plus lent"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "I_nclure les tests distants"
 
@@ -18796,7 +19889,7 @@ msgstr ""
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:330
+#: ../plugins/save-attachments/save-attachments.c:314
 msgid "Save attachments"
 msgstr "Enregistrer les pièces jointes"
 
@@ -18808,16 +19901,15 @@ msgstr "Enregistrer les pièces jointes..."
 msgid "Save all attachments"
 msgstr "Enregistrer toutes les pièces jointes"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "Sélectionnez le nom de la sauvegarde"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "Type MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -18825,79 +19917,79 @@ msgstr "Enregistrer"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:167
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "Liste de description"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "Liste des catégories"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "Liste de commentaire"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "Créé"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "Liste de contacts"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "Début"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "Fin"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "pourcentage effectué"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "Liste des participants"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "Modifié"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "Options avancées pour le format CSV"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "Ajouter un en-tête"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "Délimiteur des champs :"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "Séparateur de l'enregistrement :"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "Encapsuler les valeurs avec :"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "Format CSV » (.csv)"
 
@@ -18919,15 +20011,15 @@ msgstr "Enregi_strer sur disque"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:154
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "Format RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "Sélectionner un fichier de destination"
 
@@ -18952,7 +20044,7 @@ msgid "Show _only this Task List"
 msgstr "Afficher _uniquement cette liste de tâches"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
+msgid "A plugin that manages the Startup wizard."
 msgstr "Un greffon qui gère l'assistant de lancement."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
@@ -18985,24 +20077,24 @@ msgid "Importing files"
 msgstr "Importation de fichiers"
 
 #: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:144
 msgid "Please select the information that you would like to import:"
 msgstr "Sélectionnez les informations que vous désirez importer :"
 
 #: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../shell/e-shell-importer.c:397
 #, c-format
 msgid "From %s:"
 msgstr "De %s :"
 
 #: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../shell/e-shell-importer.c:508
 #, c-format
 msgid "Importing data."
 msgstr "Importation des données."
 
 #: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../shell/e-shell-importer.c:522
 msgid "Please wait"
 msgstr "Veuillez patienter"
 
@@ -19023,6 +20115,30 @@ msgstr "Tri des messages par sujet"
 msgid "F_all back to threading messages by subject"
 msgstr "Revenir au tri des messages par su_jet"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Liste de paires mot-clé/valeur pour le greffon Modèles en vue de leur "
+"substitution dans le corps des messages."
+
+#: ../plugins/templates/templates.c:614
+msgid "No title"
+msgstr "Sans titre"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Enregistrer comme _modèle"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Enregistre comme modèle"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Greffon de modèles basés sur des brouillons"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr ""
@@ -19049,69 +20165,150 @@ msgid "Evolution Test component"
 msgstr "Composant Test d'Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "Une chaîne décrivant les paramètres actuels de l'imprimante."
+msgid "Authenticate proxy server connections"
+msgstr "Connexions authentifiées au serveur mandataire"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
+msgid "Automatic proxy configuration URL"
+msgstr "URL de configuration automatique du serveur mandataire"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Numéro de version"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Decides whether the crash detection should be run or not."
 msgstr "Décide si la détection d'arrêt brutal doit être active ou non."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Largeur par défaut du panneau latéral"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "Hauteur par défaut de la fenêtre"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "État par défaut de la fenêtre"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "Largeur par défaut de la fenêtre"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+"Active les paramètres du serveur mandataire lors d'accès HTTP/HTTP sécurisé "
+"à Internet."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "HTTP proxy host name"
+msgstr "Nom d'hôte du serveur mandataire HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy password"
+msgstr "Mot de passe du serveur mandataire HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy port"
+msgstr "Port du serveur mandataire HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "HTTP proxy username"
+msgstr "Nom d'utilisateur du serveur mandataire HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID ou alias du composant à afficher par défaut au démarrage."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username/password combo is defined by \"/apps/evolution/shell/network_config/"
+"authentication_user\" and locally stored password in .gnome2_private/."
+msgstr ""
+"Si vrai, les connexions au serveur mandataire nécessitent une "
+"authentification. L'ensemble nom d'utilisateur/mot de passe est défini par « /"
+"apps/evolution/shell/network_config/authentication_user » et le mot de passe "
+"est enregistré localement dans .gnome2_private/."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
 msgstr "Dernier numéro de version d'Evolution mise à jour"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Liste des chemins des dossiers à synchroniser sur le disque pour "
 "l'utilisation hors ligne"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Non-proxy hosts"
+msgstr "Hôtes sans serveur mandataire"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr ""
+"Mot de passe à fournir à l'authentification lors de l'usage du serveur "
+"mandataire HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Proxy configuration mode"
+msgstr "Mode de configuration du serveur mandataire"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy host name"
+msgstr "Nom d'hôte du serveur mandataire SOCKS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "SOCKS proxy port"
+msgstr "Port du serveur mandataire SOCKS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy host name"
+msgstr "Nom d'hôte du serveur mandataire HTTP sécurisé"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Secure HTTP proxy port"
+msgstr "Port du serveur mandataire HTTP sécurisé"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
+msgstr ""
+"Indique le mode de configuration du serveur mandataire. Les valeurs prises "
+"en charge sont 0, 1, 2 et 3 signifiant respectivement « utiliser les réglages "
+"système », « pas de serveur mandataire », « utiliser une configuration "
+"manuelle du serveur mandataire » et « utiliser la configuration du serveur "
+"mandataire fournie par l'URL d'autoconfiguration »."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "Le panneau latéral est visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "Ignorer les dialogues d'avertissement de développement"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
 msgstr "Ignorer les dialogues d'avertissement de récupération"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:576
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
 msgid "Start in offline mode"
 msgstr "Démarrer en mode hors ligne"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "La barre d'état est visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19119,19 +20316,19 @@ msgstr ""
 "Le numéro de version d'Evolution, avec les niveaux /major/minor/"
 "configuration (par ex. « 2.6.0 »)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default height for the main window, in pixels."
 msgstr "Hauteur par défaut de la fenêtre principale, en pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "The default width for the main window, in pixels."
 msgstr "Largeur par défaut de la fenêtre principale, en pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "Largeur par défaut du panneau latéral, en pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19139,7 +20336,43 @@ msgstr ""
 "La dernière version mise à jour d'Evolution, avec les niveaux /major/minor/"
 "configuration (par ex. « 2.6.0 »)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The machine name to proxy HTTP through."
+msgstr "Le nom de la machine servant de serveur mandataire HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The machine name to proxy secure HTTP through."
+msgstr "Le nom de la machine servant de serveur mandataire HTTP sécurisé."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+msgid "The machine name to proxy socks through."
+msgstr "Le nom de la machine servant de serveur mandataire SOCKS."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+"Le port de la machine servant de serveur mandataire HTTP définie par « /apps/"
+"evolution/shell/network_config/http_host »."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+"Le port de la machine servant de serveur mandataire HTTP sécurisé définie "
+"par « /apps/evolution/shell/network_config/secure_host »."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+"Le port de la machine servant de serveur mandataire SOCKS définie par « /apps/"
+"evolution/shell/network_config/socks_host »."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19150,58 +20383,85 @@ msgstr ""
 "« toolbar » est choisi, le style des boutons est défini par le paramètre "
 "GNOME de la barre d'outils."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+"Cette clé contient une liste d'hôtes qui sont connectés directement plutôt "
+"qu'à travers le serveur mandataire (s'il est actif). Les valeurs peuvent "
+"être des noms d'hôtes, des domaines (en utilisant un caractère générique "
+"comme *.toto.com), des adresses IP d'hôtes (IPv4 ou IPv6) et des adresses de "
+"réseaux avec un masque de réseau (quelque chose du type 192.168.0.0/24)."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "Barre d'outils visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "URL that provides proxy configuration values."
+msgstr "URL fournissant les paramètres de configuration du serveur mandataire."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+msgid "Use HTTP proxy"
+msgstr "Utiliser un serveur mandataire HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr ""
+"Nom d'utilisateur à fournir à l'authentification lors de l'usage du serveur "
+"mandataire HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Indique si Evolution doit démarrer en mode hors ligne plutôt qu'en mode "
 "connecté."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether crash detection should be done or not"
 msgstr "Indique si la détection d'arrêt brutal doit être active"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether or not the window should be maximized."
 msgstr "Indique si la fenêtre doit être maximisée."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "Indique si le panneau latéral doit être visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the status bar should be visible."
 msgstr "Indique si la barre d'état doit être visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
 msgstr "Indique si la barre d'outils doit être visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Indique si les fenêtres d'avertissement de la version de développement "
 "d'Evolution sont ignorées."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in recovery of Evolution is skipped."
 msgstr ""
 "Indique si les fenêtres d'avertissement de récupération d'Evolution sont "
 "ignorées."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "Indique si la fenêtre des boutons doit être visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Style des boutons de la fenêtre"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Les boutons de la fenêtre sont visibles"
 
@@ -19217,11 +20477,11 @@ msgstr "Connexions actives"
 msgid "Click OK to close these connections and go offline"
 msgstr "Cliquez sur Valider pour fermer ces connexions et passer hors ligne"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:132
 msgid "Choose the type of importer to run:"
 msgstr "Choisissez l'assistant d'importation à lancer :"
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -19235,11 +20495,11 @@ msgstr ""
 "Si vous ignorez le type, sélectionnez « Automatique » et Evolution essaiera "
 "de l'utiliser."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid "Choose the destination for this import"
 msgstr "Choisissez la destination de cette importation"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:147
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -19251,79 +20511,59 @@ msgstr ""
 "Aucun paramètre pouvant être importé n'a été trouvé. Si vous\n"
 "voulez essayer de nouveau, cliquez sur le bouton « Précédent ».\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Nom du f_ichier :"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Sélectionnez un fichier"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:299
 msgid "File _type:"
 msgstr "_Type de fichier :"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:335
 msgid "Import data and settings from _older programs"
 msgstr "Importer les données et paramètres d'_anciens programmes"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:338
 msgid "Import a _single file"
 msgstr "Importer un _seul fichier"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-settings-dialog.c:314
 msgid "Evolution Preferences"
 msgstr "Préférences d'Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Aucun nom de dossier spécifié."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Un nom de dossier ne peut pas contenir le caractère Entrée."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Un nom de dossier ne peut pas contenir le caractère « / »."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Un nom de dossier ne peut pas contenir le caractère « # »."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "« . » et « .. » sont des noms de dossiers réservés."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "Les outils du GNOME Pilot ne semblent pas être installés sur ce système."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "Erreur à l'exécution de %s."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy n'est pas installé."
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne peut pas être exécuté."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:744
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Christophe Merlet <redfox@redfoxcenter.org>\n"
@@ -19341,77 +20581,82 @@ msgstr ""
 "Stéphane Raimbault <stephane.raimbault@gmail.com>\n"
 "Robert-André Mauchin <zebob.m@pengzone.org>\n"
 "Jonathan Ernst <jonathan@ernstfamily.ch>\n"
-"Claude Paroz <claude@2xlibre.net>"
+"Claude Paroz <claude@2xlibre.net>\n"
+"Bruno Brouard <annoa.b@gmail.com>"
 
-#: ../shell/e-shell-window-commands.c:755
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Site Web d'Evolution"
 
-#: ../shell/e-shell-window-commands.c:773
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Erreur lors de l'ouverture de la page Web de la Foire aux questions."
 
-#: ../shell/e-shell-window-commands.c:970
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "Travailler _en ligne"
 
-#: ../shell/e-shell-window-commands.c:983 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "Travailler _hors ligne"
 
-#: ../shell/e-shell-window-commands.c:996
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Travail hors ligne"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:377
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
-"Evolution est actuellement en ligne. Cliquez sur ce bouton pour travailler "
-"hors ligne."
+"Evolution est actuellement en ligne.\n"
+"Cliquez sur ce bouton pour travailler hors ligne."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution est en train de passer hors ligne."
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:391
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
-"Evolution est actuellement hors ligne. Cliquez sur ce bouton pour travailler "
-"en ligne."
+"Evolution est actuellement hors ligne.\n"
+"Cliquez sur ce bouton pour travailler en ligne."
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:780
 #, c-format
 msgid "Switch to %s"
 msgstr "Changer pour %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:638
 msgid "Unknown system error."
 msgstr "Erreur système inconnue."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
 #, c-format
 msgid "%ld KB"
 msgstr "%ld Kio"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "Valider"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1280
 msgid "Invalid arguments"
 msgstr "Paramètres non valides"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1282
 msgid "Cannot register on OAF"
 msgstr "Impossible d'enregistrer dans OAF"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1284
 msgid "Configuration Database not found"
 msgstr "Base de données de configuration non trouvée"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "Nouveau"
 
@@ -19466,7 +20711,7 @@ msgstr ""
 "d'importation de fichiers externes dans Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:222
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19505,7 +20750,7 @@ msgstr ""
 "Nous espérons que vous apprécierez le résultat de notre dur labeur,\n"
 "et nous attendons impatiemment vos contributions !\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19513,19 +20758,19 @@ msgstr ""
 "Merci,\n"
 "L'équipe d'Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:253
 msgid "Do not tell me again"
 msgstr "Ne plus afficher le message"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:303
 msgid "Evolution Crash Detection"
 msgstr "Détection d'arrêt brutal d'Evolution"
 
-#: ../shell/main.c:316
+#: ../shell/main.c:305
 msgid "Ig_nore"
 msgstr "Ig_norer"
 
-#: ../shell/main.c:331
+#: ../shell/main.c:320
 #, no-c-format
 msgid ""
 "Evolution appears to have exited unexpectedly the last time it was\n"
@@ -19537,39 +20782,39 @@ msgstr ""
 "masqués.\n"
 "Vous pouvez rétablir les volets d'aperçu depuis le menu Affichage.\n"
 
-#: ../shell/main.c:342
+#: ../shell/main.c:331
 msgid "_Do not show this message again"
 msgstr "_Ne plus afficher ce message"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:563
 msgid "Start Evolution activating the specified component"
 msgstr "Démarre Evolution en activant le composant spécifié"
 
-#: ../shell/main.c:578
+#: ../shell/main.c:567
 msgid "Start in online mode"
 msgstr "Démarre en mode connecté"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:570
 msgid "Forcibly shut down all Evolution components"
 msgstr "Force l'arrêt de tous les composants d'Evolution"
 
-#: ../shell/main.c:585
+#: ../shell/main.c:574
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Force la remigration depuis Evolution 1.4"
 
-#: ../shell/main.c:588
+#: ../shell/main.c:577
 msgid "Send the debugging output of all components to a file."
 msgstr "Envoie la sortie de débogage de tous les composants vers un fichier."
 
-#: ../shell/main.c:590
+#: ../shell/main.c:579
 msgid "Disable loading of any plugins."
 msgstr "Désactive le chargement des greffons."
 
-#: ../shell/main.c:592
+#: ../shell/main.c:581
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Désactive l'aperçu des courriels, contacts et tâches."
 
-#: ../shell/main.c:677
+#: ../shell/main.c:666
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Le client de messagerie et l'agenda Evolution"
 
@@ -19721,7 +20966,7 @@ msgstr ""
 "Si vous choisissez de continuer, il se peut que vous n'ayez plus accès à "
 "certaines de vos anciennes données.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19732,7 +20977,7 @@ msgstr ""
 "\n"
 "Éditer les paramètres d'approbation :"
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:151
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -19742,7 +20987,7 @@ msgstr ""
 "certificat alors vous faites confiance en l'authenticité de ce certificat à "
 "moins que quelque chose n'indique le contraire ici"
 
-#: ../smime/gui/cert-trust-dialog.c:158
+#: ../smime/gui/cert-trust-dialog.c:155
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -19800,11 +21045,16 @@ msgstr "Adresse électronique"
 msgid "All CA certificate files"
 msgstr "Tous les fichiers de certification CA"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:339
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visionneur de certificat : %s"
 
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Saisissez le mot de passe pour « %s »"
+
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -19815,7 +21065,7 @@ msgid "Enter new password"
 msgstr "Saisissez le nouveau mot de passe"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:115
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19824,7 +21074,7 @@ msgstr ""
 "Émis vers :\n"
 "   Sujet : %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19833,7 +21083,7 @@ msgstr ""
 "Émis par :\n"
 "   Sujet : %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:168
 msgid "Select certificate"
 msgstr "Sélectionnez le certificat"
 
@@ -20028,7 +21278,7 @@ msgid "_Edit CA Trust"
 msgstr "M_odifier l'approbation CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:679
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "Certificat déjà existant"
 
@@ -20237,8 +21487,7 @@ msgstr "Co_pier tous les contacts vers..."
 msgid "Contact _Preview"
 msgstr "_Aperçu du contact"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copier"
@@ -20263,8 +21512,7 @@ msgstr "Copier vers le dossier..."
 msgid "Create a new addressbook folder"
 msgstr "Crée un nouveau dossier de carnet d'adresses"
 
-#: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Couper"
@@ -20305,8 +21553,7 @@ msgstr "Déplace les contacts du dossier sélectionné vers un autre dossier"
 msgid "Move to Folder..."
 msgstr "Déplacer vers le dossier..."
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Coller"
@@ -20343,13 +21590,11 @@ msgstr "Enregistre les contacts sélectionnés comme VCard."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Enregistre les contacts du dossier sélectionné comme VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "Tout sélectionner"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "_Tout sélectionner"
 
@@ -20479,7 +21724,7 @@ msgid "Month"
 msgstr "Mois"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Suivant"
 
@@ -20488,7 +21733,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Prévisualise le calendrier à imprimer"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Précédent"
 
@@ -20556,233 +21801,6 @@ msgstr "Sem. de travail"
 msgid "_Open Appointment"
 msgstr "_Ouvrir un rendez-vous"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Copie le texte sélectionné dans le presse-papiers"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "Copie la sélection vers le presse-papiers"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Coupe le texte sélectionné vers le presse-papiers"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "Coupe la sélection vers le presse-papiers"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "Colle depuis le presse-papiers"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Colle le texte depuis le presse-papiers"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Sélectionne tout le texte"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Joindre"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Cliquez ici pour joindre un fichier"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Cliquez ici pour fermer la fenêtre actuelle"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Cliquez ici pour enregistrer la fenêtre actuelle"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Cliquez ici pour voir l'aide disponible"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Fermer"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "I_nsertion"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "_Pièce jointe..."
-
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "_Fermer"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:53
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Fichier"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "Aid_e"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Options"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Toute la journée"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Toute la _journée"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Classer comme confidentiel"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Classer comme privé"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Classer comme public"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Cliquez ici pour définir ou annuler les alarmes de cet événement"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Insère les options avancées d'envoi"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Transforme en événement récurrent"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Pu_blic"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr ""
-"Interroge les personnes attendues sur leur disponibilité (libre/occupé)"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "Champ _Rôle"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "_Options d'envoi"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Afficher la période comme _occupé"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Fu_seau horaire"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "L'état indique si le champ Type de participant est affiché"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "L'état indique si le champ RSVP est affiché"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "L'état indique si le champ Rôle est affiché"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "L'état indique si le champ État est affiché"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "L'état indique si le champ Fuseau horaire est affiché"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "L'état indique si les catégories sont affichées"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "L'état indique si défini comme « Événement toute la journée »"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "L'état indique si la période est affichée comme occupée"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Alarmes"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Catégories"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "C_lassification"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Confidentiel"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Libre/Occupé"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Privé"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Récurrence"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "Champ _État"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "Champ _Type"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Annule l'opération de messagerie en cours"
@@ -20814,7 +21832,6 @@ msgid "Empty _Trash"
 msgstr "_Vider la corbeille"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "D_ossier"
 
@@ -21491,9 +22508,9 @@ msgstr "_Zoom"
 msgid "_Zoom In"
 msgstr "Zoom a_vant"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Ferme cette fenêtre"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Fermer"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -21531,291 +22548,6 @@ msgstr "Affiche le mémo sélectionné"
 msgid "_Open Memo"
 msgstr "_Ouvrir le mémo"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Joindre un fichier"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "Ferme le fichier actuel"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "Supprime tout sauf la signature"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "Chiffre ce message avec PGP"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "Chiffre ce message avec votre certificat de chiffrement S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "For_mat"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "Obtenir un avertissement quand votre message est lu"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "Insére les options d'envoi"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "Ouvre un fichier"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "Chiffrer avec PGP"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "Signer avec PGP"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "_Chiffrer avec PGP"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "_Signer avec PGP"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "D_emander un accusé de lecture"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "C_hiffrer avec S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "Chiffrer avec S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "S_igner avec S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "Signer avec S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "E_nvoyer"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "Enregistrer sous"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "Enregistrer le brouillon"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "Enregistrer _sous..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "Enregistrer le _brouillon"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "Enregistre comme brouillon"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "Enregistrer dans le dossier..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "Enregistre le fichier actuel"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "Enregistre le fichier actuel avec un nom différent"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "Enregistre le message dans un dossier spécifié"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "Envoyer"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "Envoie le message au format HTML"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "Envoie ce message"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "Affecte une priorité élevée au message"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "Signe ce message avec votre clé PGP"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Signe ce message avec votre certificat de signature S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "Indique si le champ Cci est affiché"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "Indique si le champ Cc est affiché"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Indique si le champ De est affiché"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Indique si le champ Envoyé à est affiché"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Indique si le champ Répondre à est affiché"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "Indique si le champ À est affiché"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "Champ Cc_i"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "Champ _Cc"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "Tout _supprimer"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "Champ _De"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "_Ouvrir..."
-
-# voir les toggles au dessus !
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "Champ En_voyé à"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "_Prioriser le message"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "Champ _Répondre à"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "Séc_urité"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "Options d'_envoi"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "Champ _À"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Fermer"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "Enregistrer et fermer"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Enregistrer et _fermer"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "Enregistre le fichier actuel et ferme la fenêtre"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Ajoute le dossier à votre liste de dossier abonnés"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Actualiser la liste"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Actualise la liste de dossiers"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Supprime le dossier de votre liste de dossier abonnés"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "S'abonner"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Se désabonner"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverser la sélection"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Cliquer pour modifier ou afficher les détails de l'état de la tâche"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Détails de l'état"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Fuseau horaire"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "Détails de l'é_tat"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Copie les tâches sélectionnées"
@@ -22132,11 +22864,11 @@ msgid "With _Status"
 msgstr "Avec l'é_tat"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
 msgid "UTC"
 msgstr "UTC"
 
@@ -22153,8 +22885,8 @@ msgid "Select a Time Zone"
 msgstr "Sélectionner un fuseau horaire"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "Menu déroulant du fuseau horaire"
+msgid "Timezone drop-down combination box"
+msgstr "Zone de liste déroulante pour le fuseau horaire"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -22166,19 +22898,19 @@ msgstr ""
 "sélectionner un fuseau horaire.\n"
 "Utilisez le bouton droit de la souris pour réduire."
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr "Collection"
 
-#: ../widgets/menus/gal-define-views-dialog.c:360
+#: ../widgets/menus/gal-define-views-dialog.c:358
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Définir les vues pour %s"
 
+#: ../widgets/menus/gal-define-views-dialog.c:366
 #: ../widgets/menus/gal-define-views-dialog.c:368
-#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "Définir les vues"
 
@@ -22188,17 +22920,17 @@ msgid "Define Views for \"%s\""
 msgstr "Définir les vues pour « %s »"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../widgets/table/e-table-scrolled.c:216
 #: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Tableau"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "Instance"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "Enregistrement de la vue actuelle"
 
@@ -22251,11 +22983,11 @@ msgid "Create or edit views"
 msgstr "Crée ou édite des vues"
 
 # Usine ???
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Fabrique"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Définir une nouvelle vue"
 
@@ -22271,17 +23003,17 @@ msgstr "Type de la vue"
 msgid "Type of view:"
 msgstr "Type de la vue :"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Barre des pièces jointes"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Impossible de joindre le fichier %s : %s."
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -22304,34 +23036,33 @@ msgid "Suggest automatic display of attachment"
 msgstr "Suggérer l'affichage automatique de la pièce jointe"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1726
+#: ../widgets/misc/e-calendar-item.c:1273
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "Calendrier mensuel"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "Couleur de remplissage"
 
 #: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
+#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
+#: ../widgets/text/e-text.c:3659
 msgid "GDK fill color"
 msgstr "Couleur de remplissage GDK"
 
 # ??? stipple : mot inconnu
 #: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "Remplir le stipple"
 
@@ -22356,29 +23087,29 @@ msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Largeur minimale"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Largeur minimale"
 
 #: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Espacement"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:291
 msgid "Now"
 msgstr "Maintenant"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:848
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "La date doit être dans le format : %s"
@@ -22387,152 +23118,150 @@ msgstr "La date doit être dans le format : %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Le pourcentage doit être compris entre 0 et 100 inclus"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Arabic"
 msgstr "Arabe"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Baltic"
 msgstr "Balte"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Central European"
 msgstr "Europe centrale"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Chinese"
 msgstr "Chinois"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Cyrillic"
 msgstr "Cyrillique"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Greek"
 msgstr "Grec"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japonais"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Coréen"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Thai"
 msgstr "Thaï"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
 msgstr "Turc"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Western European"
 msgstr "Européen de l'ouest"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European, New"
 msgstr "Européen de l'ouest, Nouveau"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
 msgid "Traditional"
 msgstr "Traditionnel"
 
-#: ../widgets/misc/e-charset-picker.c:100
-#: ../widgets/misc/e-charset-picker.c:101
-#: ../widgets/misc/e-charset-picker.c:102
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
 msgstr "Simplifié"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:97
 msgid "Ukrainian"
 msgstr "Ukrainien"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Visual"
 msgstr "Visuel"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:169
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Jeu de caractères inconnu : %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:214
 msgid "Character Encoding"
 msgstr "Codage des caractères"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:229
 msgid "Enter the character set to use"
 msgstr "Saisissez le jeu de caractères à utiliser"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:336
 msgid "Other..."
 msgstr "Autre..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:598
 msgid "Ch_aracter Encoding"
 msgstr "Codage des c_aractères"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "Date et heure"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "Zone de saisie pour fixer la date"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "Cliquez sur ce bouton pour afficher un calendrier"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
-msgstr "Menu déroulant pour choisir la date"
+#: ../widgets/misc/e-dateedit.c:394
+msgid "Drop-down combination box to select time"
+msgstr "Zone de liste déroulante de sélection de la date"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "_Maintenant"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "A_ujourd'hui"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "Date non valide"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "Heure non valide"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "Développé"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "Indique si l'icône d'extension doit être déplié"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "Libellé de l'icône d'extension"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "Utiliser le soulignement"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -22540,39 +23269,39 @@ msgstr ""
 "Si activé, un soulignement dans le texte indique que le caractère suivant "
 "est utilisé comme touche de raccourcis"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "Espace à mettre entre le libellé et le fils"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Composant graphique Libellé"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 "Un composant graphique à afficher à la place du libellé usuel de l'icône "
 "d'extension"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
 msgid "Expander Size"
 msgstr "Taille de l'icône d'extension"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
 msgid "Size of the expander arrow"
 msgstr "Taille de la flèche de l'icône d'extension"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Indicateur d'espacement"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Espace autour de la flèche de l'icône d'extension"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
-#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:748
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
@@ -22617,22 +23346,31 @@ msgstr "Dossier actuel"
 msgid "Current Message"
 msgstr "Message actuel"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:167
 msgid "Choose Image"
 msgstr "Choisissez une image"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:625
 msgid "World Map"
 msgstr "Carte du monde"
 
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:627
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
+"should instead select the timezone from the drop-down combination box below."
 msgstr ""
-"Widget de carte interactive basé sur l'utilisation de la souris afin de "
-"choisir le fuseau horaire. Les utilisateurs se servant d'un clavier peuvent "
-"sélectionner le fuseau horaire grâce au menu déroulant situé en bas."
+"Composant graphique du type carte interactive basé sur l'utilisation de la "
+"souris afin de choisir le fuseau horaire. Les utilisateurs se servant d'un "
+"clavier doivent sélectionner le fuseau horaire grâce à la zone de liste "
+"déroulante située en bas."
+
+#: ../widgets/misc/e-online-button.c:112
+msgid "Online"
+msgstr "En ligne"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr "L'état du bouton est en ligne"
 
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
@@ -22659,61 +23397,61 @@ msgstr "Modèle de replacement"
 msgid "Column width"
 msgstr "Largeur des colonnes"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "Recherche"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "Cliquez ici pour modifier le type de recherche"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "_Recherche"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "_Trouver maintenant"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "_Effacer"
 
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "ID de l'élément"
 
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Texte"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1013
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "_Afficher : "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1030
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "_Rechercher : "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1042
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " _dans "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Rangée de curseurs"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Colonne de curseurs"
@@ -22730,7 +23468,7 @@ msgstr "Mode de sélection"
 msgid "Cursor Mode"
 msgstr "Mode du curseur"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:518
 msgid "When de_leted:"
 msgstr "Si s_upprimé :"
 
@@ -22754,10 +23492,6 @@ msgstr "<b>Suivi de l'état</b>"
 msgid "A_uto-delete sent item"
 msgstr "S_upprimer automatiquement l'élément envoyé"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Classification"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "Cré_er un élément envoyé pour suivre l'information"
@@ -22838,39 +23572,40 @@ msgstr "_Après :"
 msgid "_All information"
 msgstr "_Toutes les informations"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#. To translators: This means Delay the message delivery for some time
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
 msgstr "_Retarder la distribution du message"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "_Distribué"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "_Définir une date d'expiration"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "_Jusqu'au :"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "Quand cela vous _convient"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "_Quand ouvert :"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:303
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% effectué)"
@@ -22915,23 +23650,23 @@ msgstr "Colonne ayant le focus"
 msgid "Unselected Column"
 msgstr "Colonne non sélectionnée"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "Colonne barrée"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "Colonne soulignée"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "Colonne en gras"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "Colonne en couleur"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "Colonne de couleur d'arrière-plan"
 
@@ -22969,7 +23704,7 @@ msgid "A_vailable Fields:"
 msgstr "Champs _disponibles :"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "Croissant"
 
@@ -22982,7 +23717,7 @@ msgid "Clear _All"
 msgstr "_Tout effacer"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "Décroissant"
 
@@ -23045,14 +23780,14 @@ msgstr "_Trier..."
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
 #: ../widgets/table/e-table-field-chooser-item.c:634
 #: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1886
+#: ../widgets/table/e-table-header-item.c:1887
 msgid "DnD code"
 msgstr "Code Glisser/Déposer"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
 #: ../widgets/table/e-table-field-chooser-item.c:641
 #: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "En-tête complet"
 
@@ -23086,297 +23821,317 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d élément)"
 msgstr[1] "%s (%d éléments)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Couleurs de rangées alternatives"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "Grille de dessin horizontal"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "Grille de dessin vertical"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "Dessiner le focus"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Mode du curseur"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Modèle de sélection"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "Longueur du seuil"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "Hauteur de rangée uniforme"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "Gelé"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "Personnaliser la vue en cours"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "Tri _croissant"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "Tri _décroissant"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "_Ne pas trier"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "Grouper par ce _champ"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "Grouper par _boîte"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "Enlever cette c_olonne"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "_Ajouter une colonne..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "A_lignement"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "_Meilleur ajustement"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "Format des colonne_s..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "_Personnaliser la vue actuelle..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "_Trier par"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "_Personnaliser"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "Description de la police"
 
-#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-header-item.c:1915
 #: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "Info de tri"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Arborescence"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "En-tête de tableau"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Modèle de tableau"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Rangée de curseurs"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-tree.c:3356
 msgid "Always search"
 msgstr "Toujours rechercher"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Utiliser le clic pour ajouter"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
 msgid "ETree table adapter"
 msgstr "Adaptateur de table ETree"
 
 # ??? je ne comprends pas
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3362
 msgid "Retro Look"
 msgstr "Rechercher en arrière"
 
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3363
 msgid "Draw lines and +/- expanders."
 msgstr "Dessiner les lignes et les icônes d'extension +/-."
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "Méthodes de saisie"
 
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "Processeur d'événements"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "Gras"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "Barré"
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "Ancre"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "Justification"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "Largeur du masque"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "Hauteur du masque"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "Masque"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "Remplir le masque rectangulaire"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "Décalage en X"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Décalage en Y"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "Largeur du texte"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "Hauteur du texte"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "Utiliser des points de suspension"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "Points de suspension"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "Coupure des lignes"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "Caractères de coupure"
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "Lignes maximum"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "Dessiner les bordures"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "Autoriser les nouvelles lignes"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "Dessiner l'arrière-plan"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "Dessiner le bouton"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "Position du curseur"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "Contexte des méthodes de saisie"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "Poignée du menu contextuel"
 
-#~ msgid ""
-#~ "The address book {0} is read only, thus you cannot add contacts there. "
-#~ "Select other address book, please."
-#~ msgstr ""
-#~ "Le carnet d'adresses {0} est en lecture seule, vous ne pouvez pas lui "
-#~ "ajouter de contacts. Choisissez un autre carnet d'adresses."
+#~ msgid "No folder name specified."
+#~ msgstr "Aucun nom de dossier spécifié."
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "Un nom de dossier ne peut pas contenir le caractère Entrée."
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "Un nom de dossier ne peut pas contenir le caractère « / »."
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "Un nom de dossier ne peut pas contenir le caractère « # »."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "« . » et « .. » sont des noms de dossiers réservés."
+
+#~ msgid "All Day Event"
+#~ msgstr "Toute la journée"
+
+#~ msgid "Send _Options"
+#~ msgstr "_Options d'envoi"
+
+#~ msgid "Status Details"
+#~ msgstr "Détails de l'état"
+
+#~ msgid "Time Zone"
+#~ msgstr "Fuseau horaire"
diff --git a/po/gl.po b/po/gl.po
index ffb07d6eef..c3e594ae1b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,3 +1,4 @@
+# translation of evolution.HEAD.po to Galician
 # translation of evolution.HEAD.gl.po to
 # Galician translation of Evolution.
 # Copyright (C) 2000 Jesús Bravo Álvarez.
@@ -12,18 +13,17 @@
 # Manuel A. Fernández Montecelo <manuel@sindominio.net>, 2001, 2005.
 # Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2005, 2006.
 # Ignacio Casal Quinteiro <icq@svn.gnome.org>, 2007, 2008.
-#  <>, 2008
-#  <>, 2008
-#  <>, 2008
-#: ../shell/main.c:695
+# Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2008
+# Frco. Javier Rial Rodríguez <>, 2008, 2008.
+#: ../shell/main.c:683
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD.gl\n"
+"Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-31 18:16+0200\n"
-"PO-Revision-Date: 2008-05-31 18:40+0200\n"
-"Last-Translator:  <>\n"
-"Language-Team:  <en@li.org>\n"
+"POT-Creation-Date: 2008-08-07 18:06+0200\n"
+"PO-Revision-Date: 2008-08-07 18:12+0200\n"
+"Last-Translator: Frco. Javier Rial Rodríguez <>\n"
+"Language-Team: Galician <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type:  text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,21 +32,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution addressbook"
 msgstr "axenda de enderezos do Evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../a11y/addressbook/ea-minicard-view.c:32
 #: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Novo contacto"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../a11y/addressbook/ea-minicard-view.c:33
 #: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Nova lista de contactos"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -163,7 +163,7 @@ msgid "calendar view for one or more days"
 msgstr "visualización de calendario para un ou máis días"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:758
 msgid "%A %d %b %Y"
 msgstr "%A, %d de %b de %Y"
 
@@ -174,8 +174,8 @@ msgstr "%A, %d de %b de %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1545
+#: ../calendar/gui/calendar-component.c:761
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
 #: ../calendar/gui/e-week-view-main-item.c:340
 msgid "%a %d %b"
 msgstr "%a, %d de %b"
@@ -183,9 +183,9 @@ msgstr "%a, %d de %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:768
+#: ../calendar/gui/calendar-component.c:770
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -193,10 +193,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:797
 msgid "%d %b %Y"
 msgstr "%d de %b de %Y"
 
@@ -206,15 +206,15 @@ msgstr "%d de %b de %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1561
+#: ../calendar/gui/calendar-component.c:787
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
 #: ../calendar/gui/e-week-view-main-item.c:354
 msgid "%d %b"
 msgstr "%d de %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:247
 #: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:772
+#: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "Calendario do Gnome"
 
@@ -326,34 +326,34 @@ msgstr "Calendario: desde %s até %s"
 msgid "evolution calendar item"
 msgstr "elemento de calendario do Evolution"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:39
 msgid "Combo Button"
 msgstr "Botón de combinación"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:49
 msgid "Activate Default"
 msgstr "Activar os predeterminados"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:51
 msgid "Popup Menu"
 msgstr "Menú emerxente"
 
-#: ../a11y/widgets/ea-expander.c:40
+#: ../a11y/widgets/ea-expander.c:39
 msgid "Toggle Attachment Bar"
 msgstr "Conmutar a barra de anexos"
 
-#: ../a11y/widgets/ea-expander.c:50
+#: ../a11y/widgets/ea-expander.c:49
 msgid "activate"
 msgstr "activar"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr ""
-"'{0}' é unha fonte de libro de enderezos de só lectura. Cambie a vista de "
-"contactos e realce un libro de enderezos que poida aceptar contactos."
+"'{0}' é unha axenda de enderezos de só lectura. Cambie a vista de contactos "
+"e elixa un libro de enderezos distinto da barra lateral."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -402,7 +402,7 @@ msgstr "Non se pode eliminar a axenda de enderezos."
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
 "Actualmente só se pode acceder á axenda de enderezos do sistema GroupWise "
 "desde o Evolution. Use unha vez algún outro cliente de correo GroupWise para "
@@ -427,7 +427,7 @@ msgstr "Fallo ao autenticarse co servidor LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1730
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
 msgid "Failed to delete contact"
 msgstr "Fallo ao eliminar o contacto"
 
@@ -530,10 +530,9 @@ msgstr ""
 "debería actualizarse a unha versión soportada"
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid ""
-"You do not have enough permissions to delete contact in this Address Book."
+msgid "You do not have permission to delete contacts in this address book."
 msgstr ""
-"Vostede non ten os permisos suficientes para eliminar este contacto do libro "
+"Vostede non ten os permisos suficientes para eliminar contactos nesta axenda "
 "de enderezos."
 
 #: ../addressbook/addressbook.error.xml.h:36
@@ -574,7 +573,7 @@ msgstr "_Usar tal como está"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -583,17 +582,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "Enderezo de sincronización predeterminado:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
 msgid "Could not load addressbook"
 msgstr "Non se puido cargar a axenda de enderezos"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "Non se puido ler o bloque de aplicación Enderezo do pilot"
 
@@ -615,10 +614,10 @@ msgstr "Configurar aquí o completado automático"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:401
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -659,11 +658,12 @@ msgstr "Xestione os seus certificados S/MIME aquí"
 #: ../addressbook/gui/component/addressbook-component.c:144
 #: ../addressbook/gui/component/addressbook-migrate.c:499
 #: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:480
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1096
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:311
-#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1455
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "Neste computador"
 
@@ -676,20 +676,22 @@ msgstr "Neste computador"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:490
-#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1055
+#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Persoal"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "En servidores LDAP"
 
 #: ../addressbook/gui/component/addressbook-component.c:229
+msgctxt "New"
 msgid "_Contact"
 msgstr "_Contacto"
 
@@ -698,6 +700,7 @@ msgid "Create a new contact"
 msgstr "Crear un novo contacto"
 
 #: ../addressbook/gui/component/addressbook-component.c:237
+msgctxt "New"
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
@@ -711,6 +714,7 @@ msgid "New Address Book"
 msgstr "Nova axenda de enderezos"
 
 #: ../addressbook/gui/component/addressbook-component.c:245
+msgctxt "New"
 msgid "Address _Book"
 msgstr "Ax_enda de enderezos"
 
@@ -723,36 +727,36 @@ msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 "Fallo ao actualizar a configuración da axenda de enderezos ou os cartafoles."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 "Copiar o contido da a_xenda de enderezos localmente para unha operación sen "
 "conexión"
 
 #: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:292 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2362
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../calendar/gui/dialogs/calendar-setup.c:388
+#: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Xeral"
 
 #: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:559
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
@@ -765,13 +769,13 @@ msgid "Authentication"
 msgstr "Autenticación"
 
 #: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalles"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:960
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "Buscando"
 
@@ -785,12 +789,12 @@ msgid "Address Book Properties"
 msgstr "Propiedades da axenda de enderezos"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migrando..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrando `%s':"
@@ -847,48 +851,48 @@ msgstr ""
 "\n"
 "Sexa paciente mentres o Evolution migra os seus datos Pilot Sync..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
+#: ../addressbook/gui/component/addressbook-view.c:430
 #: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear o cartafol \"%s\" como:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../addressbook/gui/component/addressbook-view.c:433
 #: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "Renomear o cartafol"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
+#: ../addressbook/gui/component/addressbook-view.c:438
 #: ../mail/em-folder-utils.c:511
 msgid "Folder names cannot contain '/'"
 msgstr "Os nomes dos cartafoles non poden conter o carácter '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "_New Address Book"
 msgstr "_Nova axenda de enderezos"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:951
 msgid "Save As vCard..."
 msgstr "Gardar como vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1709 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2092 ../mail/em-folder-view.c:1347
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/calendar-component.c:620
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "E_liminar"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:957
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "Selector de orixe de contactos"
 
@@ -909,6 +913,7 @@ msgstr "Introduza o contrasinal para %s (usuario %s)"
 
 #: ../addressbook/gui/component/addressbook.c:215
 #: ../calendar/common/authentication.c:51
+#: ../plugins/google-account-setup/google-source.c:498
 #: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
@@ -1006,7 +1011,7 @@ msgid "Add Address Book"
 msgstr "Engadir axenda de enderezos"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:777
+#: ../mail/em-account-editor.c:761
 msgid "Always"
 msgstr "Sempre"
 
@@ -1014,73 +1019,78 @@ msgstr "Sempre"
 msgid "Anonymously"
 msgstr "Anonimamente"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+msgid "B_rowse this book until limit reached"
+msgstr "_Examinar este libro até que se alcance o límite"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "Básico"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "Nome distintivo"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "Enderezo de correo"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "O Evolution empregará este enderezo de correo para autenticalo co servidor."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "Localizar bases de busca posibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "_Inicio de sesión:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../mail/em-account-editor.c:776
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "Nunca"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-#: ../mail/em-account-editor.c:304
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Sen cifrado"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Un"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:312
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "Filtro de busca"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "_Base de busca:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "_Filtro de busca:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "Filtro de busca"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1090,7 +1100,7 @@ msgstr ""
 "Se isto non se modifica, a busca por defecto realizarase sobre a clase de "
 "obxectos do tipo \"person\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1098,7 +1108,7 @@ msgstr ""
 "Seleccionar esta opción significa que o Evolution só conectará co seu "
 "servidor LDAP se o seu servidor LDAP soporta SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1106,7 +1116,7 @@ msgstr ""
 "Seleccionar esta opción significa que o Evolution só conectará co seu "
 "servidor LDAP se o seu servidor LDAP soporta TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1116,23 +1126,23 @@ msgstr ""
 "TLS. Isto significa que a súa conexión será insegura e que vostede será "
 "vulnerable a fallos de seguranza."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Bases de busca soportadas"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-#: ../mail/em-account-editor.c:308
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -1142,7 +1152,7 @@ msgstr ""
 "buscas. Se deixa isto en branco, a busca comezará na raíz da árbore de "
 "directorios."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -1154,7 +1164,7 @@ msgstr ""
 "todas as entradas por debaixo da súa base de busca. Un ámbito \"un\" só "
 "incluirá as entradas un nivel por debaixo da súa base."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1162,7 +1172,7 @@ msgstr ""
 "Este é o nome completo do seu servidor LDAP. Por exemplo, \"ldap.mycompany."
 "com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1170,7 +1180,7 @@ msgstr ""
 "Este é o número máximo de entradas para descargar. Configuralo cun número "
 "demasiado grande podería ralentizar a súa axenda de enderezos."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1180,7 +1190,7 @@ msgstr ""
 "en que definir isto como \"Enderezo de correo\" require o acceso anónimo ao "
 "seu servidor LDAP."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1188,7 +1198,7 @@ msgstr ""
 "Este é o nome que identificará este servidor na lista de cartafoles do "
 "Evolution. É só para poder mostralo no monitor. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -1198,75 +1208,75 @@ msgstr ""
 "Proporcionouse unha lista de portos estándar. Pregunte ao seu administrador "
 "do sistema que porto debería especificar."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "Usando nome distintivo (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "Usando enderezo de correo"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Cando sexa posible"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "_Engadir axenda de enderezos"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "Límite de _descarga:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "_Localizar bases de busca posibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "Método de _inicio de sesión:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:174
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "Ámbito da bu_sca:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
-#: ../mail/mail-config.glade.h:183
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "_Tempo de espera:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Usar unha conexión segura:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "cartóns"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:715
 msgid "minutes"
 msgstr "minutos"
 
@@ -1307,7 +1317,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Traballo</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1319,16 +1329,16 @@ msgid "Ca_tegories..."
 msgstr "Ca_tegorías..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:201
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Contacto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:549
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:564
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -1341,7 +1351,7 @@ msgid "Image"
 msgstr "Imaxe"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1354,7 +1364,7 @@ msgid "Nic_kname:"
 msgstr "_Alcume:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1368,11 +1378,11 @@ msgstr "Teléfono"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Traballo"
 
@@ -1394,7 +1404,7 @@ msgid "_Birthday:"
 msgstr "_Aniversario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
@@ -1484,1120 +1494,1121 @@ msgstr "_Onde:"
 msgid "_Zip/Postal Code:"
 msgstr "_Código Postal:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "Enderezo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
 #: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
 #: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "Editable"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "Afganistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "Albania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "Alxeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "Samoa Americana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "Antártida"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Antigua And Barbuda"
 msgstr "Antiga e Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "Arxentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "Australia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "Austria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "Acerbaixán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "Bielorrusia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "Bélxica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "Belice"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "Bermudas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "Bután"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia e Hercegovina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "Botsuana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "Illa Bouvet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "British Indian Ocean Territory"
 msgstr "Territorio Británico do Océano Índico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "Sultanato de Brunei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "Cambodia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "Camerún"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "Canadá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "Illas Caimán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Central African Republic"
 msgstr "República Centroafricana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "Chad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "Chile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "China"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "Kiritimati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Cocos (Keeling) Islands"
 msgstr "Illas Cocos (Keeling)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "Colombia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "Comores"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "Congo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Congo, A república democrática do"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "Illas Cook"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "Costa de Marfil"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "Croacia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "Cuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "Chipre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "República Checa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "Xibutí"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "República Dominicana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "Exipto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "Guinea Ecuatorial"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "Estonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "Etiopía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "Illas Malvinas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "Illas Feroe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "Fixi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "Francia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "Güiana Francesa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "Polinesia Francesa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "French Southern Territories"
 msgstr "Territorios Franceses do Sur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "Gabón"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "Gambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "Xeorxia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "Alemaña"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "Gana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "Xibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "Grecia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "Groenlandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "Granada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "Guadalupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "Güiana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "Haití"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Heard And McDonald Islands"
 msgstr "Illas Heard e McDonald"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "Santa Sé"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "Hungría"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "Islandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "India"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "Irán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "Iraq"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Isle of Man"
 msgstr "Illa de Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "Italia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "Xamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "Xapón"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "Xordania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Kazakhstán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Corea, República democrática popular de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Korea, Republic Of"
 msgstr "Corea, República de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "Kirguizistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "Letonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "Líbano"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "Libia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "Malaisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "Maldivas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "Malí"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "Illas Marshall"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "Martinica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "Mauricio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "México"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Moldova, Republic Of"
 msgstr "Moldavia, República de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "Mónaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "Marrocos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "Namibia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "Países Baixos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "Antillas Holandesas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "Nova Caledonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "Nova Zelandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "Níxer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "Nixeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "Illa Norfolk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Northern Mariana Islands"
 msgstr "Illas Marianas do Norte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "Omán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "Paquistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "Palestina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "Panamá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Papua New Guinea"
 msgstr "Papúa Nova Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "Paraguai"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "Perú"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "Porto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "Reunión"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "Romanía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "Federación Rusa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Kitts And Nevis"
 msgstr "San Cristófer-Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "Santa Lucía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Saint Vincent And The Grenadines"
 msgstr "San Vicente e as Granadinas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "San Marino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Sao Tome And Principe"
 msgstr "São Tomé e Príncipe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "Arabia Saudí"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Serbia And Montenegro"
 msgstr "Serbia e Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "Seixeles"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "Serra Leona"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "Eslovenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "Illas Salomón"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "Somalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "Sudáfrica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Xeorxia do Sur e Illas Sandwich do Sur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "España"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "Santa Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre e Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "Sudán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Illas Svalbard e Jan Mayen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "Suazilandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "Suecia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "Suíza"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "Siria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "Taiwán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "Taxikistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzania, República Unida de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "Tailandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "Timor Leste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Trinidad And Tobago"
 msgstr "Trinidad e Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "Turquía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "Turkmenistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Turks And Caicos Islands"
 msgstr "Illas Turk e Caicos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "Ucraína"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Arab Emirates"
 msgstr "Emiratos Árabes Unidos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "United States Minor Outlying Islands"
 msgstr "Illas Exteriores Menores dos EEUU"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "Uzbekistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, British"
 msgstr "Illas Virxes, británicas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Virgin Islands, U.S."
 msgstr "Illas Virxes, estadounidenses"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Wallis And Futuna Islands"
 msgstr "Illas Wallis e Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "Sáhara Occidental"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "Iemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "Zambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "Cimbabue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../plugins/exchange-operations/exchange-delegates.c:952
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
+#: ../plugins/plugin-manager/plugin-manager.c:41
+#: ../plugins/save-attachments/save-attachments.c:350
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Nome"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "AOL Instant Messenger"
 msgstr "Messenger instantáneo AOL"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Yahoo Messenger"
 msgstr "Messenger Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "Messenger Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
 msgid "Service"
 msgstr "Servizo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:693
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "Localización"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "Nome do usuario"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Enderezo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Outros"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Source Book"
 msgstr "Axenda de enderezos de orixe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Target Book"
 msgstr "Axenda de enderezos de destino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
 msgid "Is New Contact"
 msgstr "É un contacto novo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Writable Fields"
 msgstr "Campos que se poden escribir"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Required Fields"
 msgstr "Campos requiridos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Modificado"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:559
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2424
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de Contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2820
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "Please select an image for this contact"
 msgstr "Escolla unha imaxe para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "_No image"
 msgstr "_Sen imaxe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2605,47 +2616,47 @@ msgstr ""
 "Os datos de contacto non son válidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ten un formato non válido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3105
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ten un formato non válido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3120
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3131
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' está baleiro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3146
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
 msgid "Invalid contact."
 msgstr "Contacto non válido."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:334
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "Adición rápida de contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "_Editar Completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "Nome _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "Correo _electrónico"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "_Seleccione a axenda de enderezos"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2654,7 +2665,7 @@ msgstr ""
 "Está seguro de que quere\n"
 "eliminar a lista de contactos (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2662,7 +2673,7 @@ msgstr ""
 "Está seguro de que quere\n"
 "eliminar estas listas de contactos?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2671,7 +2682,7 @@ msgstr ""
 "Está seguro de que quere\n"
 "eliminar o contacto (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2822,9 +2833,9 @@ msgstr "_Integrantes"
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
 #: ../addressbook/gui/widgets/e-addressbook-model.c:298
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:216
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Axenda de enderezos"
 
@@ -2869,40 +2880,40 @@ msgstr ""
 "O nome ou enderezo de correo deste contacto xa existe neste\n"
 "cartafol. Quere engadilo de todas as formas?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "Combinar contacto"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "_Combinar"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "Combinar contacto"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
 #: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Correo Electrónico"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
-#: ../calendar/gui/cal-search-bar.c:81 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Calquera campo contén"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "O correo comeza por"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "O nome comeza por"
+msgid "Name contains"
+msgstr "O nome contén"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2917,9 +2928,9 @@ msgstr[1] "%d contactos"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Consulta"
 
@@ -2930,7 +2941,7 @@ msgstr "Erro ao obter a visualización da axenda de enderezos"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-table.c:3353
 #: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
@@ -2940,105 +2951,108 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Erro ao modificar o cartón"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:223
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+msgid "Name begins with"
+msgstr "O nome comeza por"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "Fonte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:509
+#: ../calendar/gui/e-meeting-list-view.c:508
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tipo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:816
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
 msgid "Save as vCard..."
 msgstr "Gardar como vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1574
+#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "_Novo contacto..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "Nova _lista de contactos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "_Gardar como vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "_Reenviar contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "_Reenviar contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "Enviar unha _mensaxe ao contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "Enviar unha _mensaxe á lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "Enviar unha _mensaxe aos contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "Im_primir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "Co_piar á axenda de enderezos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "Mo_ver á axenda de enderezos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:455
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1694 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2011 ../mail/em-folder-tree.c:998
-#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2045
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "_Pegar"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1520
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
+#: ../calendar/gui/cal-search-bar.c:680
 msgid "Any Category"
 msgstr "Calquera categoría"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1730
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
 #: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "Outro erro"
@@ -3074,7 +3088,7 @@ msgstr "Teléfono do automóbil"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:143
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3175,9 +3189,9 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:521
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:713
 msgid "Role"
 msgstr "Rol"
 
@@ -3213,38 +3227,38 @@ msgid "Web Site"
 msgstr "Sitio Web"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
 #: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
 #: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Largura"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:164
+#: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
 #: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Altura"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:172
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Ten foco"
 
@@ -3268,7 +3282,17 @@ msgstr "Lonxitude máxima do campo"
 msgid "Column Width"
 msgstr "Largura da columna"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"A buscar os contactos..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3282,7 +3306,7 @@ msgstr ""
 "\n"
 "ou prema dúas veces aquí para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3296,7 +3320,7 @@ msgstr ""
 "\n"
 "Prema aquí dúas veces para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3306,7 +3330,7 @@ msgstr ""
 "\n"
 "Buscar o contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3316,41 +3340,41 @@ msgstr ""
 "\n"
 "Non hai elementos para mostrar nesta visualización."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adaptador"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Correo electrónico do traballo"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Correo electrónico particular"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
-#: ../addressbook/gui/widgets/e-minicard.c:833
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "Outro correo electrónico"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Seleccionado"
 
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Posúe cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
 msgid "_Open Link in Browser"
 msgstr "_Abrir ligazón no navegador"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "_Copiar localización da ligazón"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:639
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
 msgid "_Send New Message To..."
 msgstr "_Enviar unha mensaxe nova a..."
 
@@ -3393,12 +3417,12 @@ msgid "Video Chat"
 msgstr "Videoconferencia"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2377
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/gnome-cal.c:2376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:574
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
@@ -3410,8 +3434,7 @@ msgstr "Calendario"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "Dispoñibilidade"
 
@@ -3433,12 +3456,14 @@ msgid "Web Log"
 msgstr "Blogue"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2362
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Aniversario"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2363
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Aniversario"
 
@@ -3484,7 +3509,7 @@ msgstr "Ningún contacto propio definido"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -3506,11 +3531,11 @@ msgstr "Non se soprota o protocolo"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -3757,7 +3782,7 @@ msgstr "Información de contacto"
 msgid "Contact information for %s"
 msgstr "Información de contacto de %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:313
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
 msgid "Querying Address Book..."
 msgstr "Consultando a axenda de enderezos..."
 
@@ -3785,43 +3810,43 @@ msgstr "Gardar na axenda de enderezos"
 msgid "Card View"
 msgstr "Visualización de cartón"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../addressbook/importers/evolution-csv-importer.c:658
+#: ../addressbook/importers/evolution-ldif-importer.c:498
 #: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importando..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de intercambio de datos LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "Importador de LDIF do Evolution"
 
@@ -3874,7 +3899,7 @@ msgid "Format"
 msgstr "Formato"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
 #: ../widgets/table/e-table-field-chooser-item.c:648
 #: ../widgets/table/e-table-field-chooser.c:81
@@ -3981,7 +4006,7 @@ msgstr "Sombreado"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:986
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -4000,7 +4025,7 @@ msgid "Top:"
 msgstr "Superior:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:153
 msgid "Type:"
 msgstr "Tipo:"
 
@@ -4109,20 +4134,20 @@ msgstr "Erro non soportado"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
-"'{0}' é unha fonte de calendario de só lectura. Cambia calendario a un que "
-"poida aceptar citas."
+"'{0}' é un calendario de só lectura. Cambie á vista de calendario e elixa un "
+"calendario distinto da barra lateral."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
-"'{0}' é unha fonte de calendario de só lectura. Cambia a vista de calendario "
-"e realce un calendario que poida aceptar citas."
+"'{0}' é un calendario de só lectura. Cambia a vista de calendario e elixa un "
+"calendario que poida aceptar citas."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
@@ -4215,19 +4240,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Está seguro de que quere eliminar esta cita?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/gui/dialogs/delete-comp.c:179
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Está seguro de que quere eliminar esta reunión?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Está seguro de que quere eliminar esta nota?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Está seguro de que quere eliminar esta tarefa?"
@@ -4386,8 +4411,8 @@ msgid "The calendar is not marked for offline usage."
 msgstr "O calendario non está marcado para o uso sen conexión."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
-msgstr "A lista de notas non está marcada para o uso sen conexión"
+msgid "The memo list is not marked for offline usage."
+msgstr "A lista de notas non está marcada para o uso sen conexión."
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
@@ -4478,12 +4503,11 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "As súas tarefas non estarán dispoñibles até que reinicie o Evolution."
 
 #: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Rexeitar as modificacións"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:492
-#: ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "_Gardar"
 
@@ -4492,8 +4516,8 @@ msgid "_Save Changes"
 msgstr "_Gardar modificacións"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Enviar"
 
@@ -4505,55 +4529,55 @@ msgstr "_Enviar notificación"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Dividir eventos de días múltiples:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1519
-#: ../calendar/conduits/calendar/calendar-conduit.c:1520
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "Non se puido iniciar o servidor Evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1627
-#: ../calendar/conduits/calendar/calendar-conduit.c:1630
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "Non se puido ler o bloque da aplicación do calendario do pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "Non se puido ler o bloque da aplicación Memo do pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "Non se puido escribir o bloque da aplicación Memo do pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Prioridade predeterminada:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "Non se puido ler o bloque de aplicación ToDo do pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "Non se puido escribir o bloque de aplicación ToDo do pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "Calendario e tarefas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:1403
 msgid "Calendars"
 msgstr "Calendarios"
 
@@ -4594,23 +4618,23 @@ msgid "Memo_s"
 msgstr "Nota_s"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1121
-#: ../calendar/gui/gnome-cal.c:1703 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
+#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "Notas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1430
-#: ../calendar/gui/gnome-cal.c:1575 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1982
+#: ../calendar/gui/tasks-component.c:540
+#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/importers/icalendar-importer.c:74
+#: ../calendar/importers/icalendar-importer.c:735
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:586
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4630,25 +4654,25 @@ msgstr "_Tarefas"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servizo de notificación por alarma do Calendario do Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:113
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:128
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:716
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "horas"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:284
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "Hora de comezo"
 
@@ -4659,9 +4683,9 @@ msgstr "Citas"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1600
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Localización:"
@@ -4671,14 +4695,15 @@ msgid "Snooze _time:"
 msgstr "_Pospor o aviso:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:166
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -4690,32 +4715,32 @@ msgstr "_Pospor"
 msgid "location of appointment"
 msgstr "localización da cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
 msgid "No summary available."
 msgstr "Non hai resumo dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No description available."
 msgstr "Non hai descrición dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1478
 msgid "No location information available."
 msgstr "Non hai información da localización dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
 #, c-format
 msgid "You have %d alarms"
 msgstr "Posúe %d alarmas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1584
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1684
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1712
+#: ../mail/mail-component.c:1587
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4727,7 +4752,7 @@ msgstr ""
 "configurado para enviar unha mensaxe de correo electrónico. No seu lugar\n"
 "Evolution vai mostrar un diálogo de aviso normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4744,15 +4769,15 @@ msgstr ""
 "\n"
 "Está seguro de que quere executar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1732
 msgid "Do not ask me about this program again."
 msgstr "Non volver preguntar sobre este programa."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:139
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "Non se puido iniciar o Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:152
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4765,7 +4790,7 @@ msgid "invalid time"
 msgstr "hora non válida"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4774,7 +4799,7 @@ msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4785,7 +4810,7 @@ msgstr[1] "%d minutos"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
@@ -5038,12 +5063,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Mostrar o campo de estado no editor de eventos/tarefas/reunións"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Mostrar o panel de \"Previsualización\""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Mostrar o panel de \"Previsualización\"."
 
@@ -5240,66 +5265,66 @@ msgstr "Minuto de comezo da xornada laboral"
 msgid "daylight savings time"
 msgstr "horario de verán"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Summary contains"
 msgstr "O resumo contén"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Description contains"
 msgstr "A descrición contén"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Category is"
 msgstr "A categoría é"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Comment contains"
 msgstr "O comentario contén"
 
-#: ../calendar/gui/cal-search-bar.c:80
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Location contains"
 msgstr "A localización contén"
 
-#: ../calendar/gui/cal-search-bar.c:626 ../calendar/gui/cal-search-bar.c:669
-#: ../calendar/gui/cal-search-bar.c:688
+#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
+#: ../calendar/gui/cal-search-bar.c:684
 msgid "Unmatched"
 msgstr "Sen equivalencia"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:630
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos seguintes sete días"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:634
 msgid "Active Tasks"
 msgstr "Tarefas activas"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:638
 msgid "Overdue Tasks"
 msgstr "Tarefas pendentes"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:642
 msgid "Completed Tasks"
 msgstr "Tarefas terminadas"
 
-#: ../calendar/gui/cal-search-bar.c:650
+#: ../calendar/gui/cal-search-bar.c:646
 msgid "Tasks with Attachments"
 msgstr "Tarefas con anexos"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:692
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: ../calendar/gui/cal-search-bar.c:700
+#: ../calendar/gui/cal-search-bar.c:696
 msgid "Next 7 Days' Appointments"
 msgstr "Citas dos seguintes sete días"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimir"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5309,15 +5334,15 @@ msgstr ""
 "antigos que o tempo seleccionado. Se continúa, non poderá recuperar estes "
 "eventos."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Purgar eventos anteriores a"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:397
+#: ../plugins/google-account-setup/google-source.c:717
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "días"
@@ -5326,103 +5351,107 @@ msgstr "días"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:510
-#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1123
-#: ../calendar/gui/tasks-component.c:231
+#: ../calendar/gui/calendar-component.c:274
+#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
+#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
+#: ../calendar/gui/tasks-component.c:232
 msgid "On The Web"
 msgstr "Na Web"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:404
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Datas de nacementos e aniversarios"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Tempo"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:616
 msgid "_New Calendar"
 msgstr "_Novo calendario"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2087
+#: ../calendar/gui/calendar-component.c:617
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2101
+#: ../calendar/gui/calendar-component.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:950
 msgid "Failed upgrading calendars."
 msgstr "Fallou ao actualizar calendarios."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1249
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Non se puido abrir o calendario '%s' para crear eventos e reunións"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1265
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Non hai ningún calendario dispoñible para crear eventos e reunións"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1378
 msgid "Calendar Source Selector"
 msgstr "Selector de orixe do calendario"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Nova cita"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Crear unha cita nova"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Nova reunión"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
 msgid "M_eeting"
 msgstr "R_eunión"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Crear unha solicitude de nova reunión"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Nova cita para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Cita para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Crear unha nova cita para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Novo calendario"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Crear un novo calendario"
 
@@ -5443,15 +5472,219 @@ msgid "Month View"
 msgstr "Visualización mensual"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "Calquera campo"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Anexos"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Participante"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "Traballo"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Categoría"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Clasificación"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "Competición"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Confidencial"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Descrición"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "A descrición contén"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "Non existe"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Existe"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Favoritos"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "Regalos"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "Obxectivos"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Vacacións"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "Tarxetas de vacaciones"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "Contactos"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Ideas"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "Internacional"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "Cliente chave"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "Varios"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Tarefas dos seguintes 7 días"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "Organizador"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "Chamadas de teléfono"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "Privado"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "Público"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:298
+msgid "Recurrence"
+msgstr "Recorrencia"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Estado"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Estratexias"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "Resumo"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "O resumo contén"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "Provedores"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "Tempo e gastos"
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "VIP"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "Esperando"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "contén"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "non contén"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "é"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "non é"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Erro ao abrir o calendario"
@@ -5464,11 +5697,11 @@ msgstr "Método non soportado ao abrir o calendario"
 msgid "Permission denied to open the calendar"
 msgstr "Permiso denegado para abrir o calendario"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "Editar alarma"
 
@@ -5501,17 +5734,17 @@ msgid "Mes_sage:"
 msgstr "Mensa_xes:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "Reproducir un son"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "Emerxer unha alerta"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "Executar un programa"
 
@@ -5524,7 +5757,7 @@ msgid "Send To:"
 msgstr "Enviar a:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "Enviar un correo"
 
@@ -5571,7 +5804,10 @@ msgstr "tempos adicionais a cada"
 msgid "hour(s)"
 msgstr "hora(s)"
 
+#. Translators: This is the second half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:247
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -5579,7 +5815,7 @@ msgstr "minuto(s)"
 msgid "start of appointment"
 msgstr "comezo da cita"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
 msgid "Action/Trigger"
 msgstr "Acción/Activador"
 
@@ -5590,16 +5826,15 @@ msgstr "Enga_dir"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-composer-actions.c:63
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suxerir mostrar o anexo automaticamente"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
 msgid "Attach file(s)"
 msgstr "Anexar ficheiro(s)"
 
@@ -5670,8 +5905,8 @@ msgid "Display"
 msgstr "Mostrar"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Venres"
 
@@ -5686,8 +5921,8 @@ msgstr ""
 "Días"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Luns"
 
@@ -5710,7 +5945,7 @@ msgstr ""
 "Domingo"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Seleccionar unha cor"
 
@@ -5720,8 +5955,8 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -5738,8 +5973,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Mostrar os _números das semanas no navegador de datas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -5757,8 +5992,8 @@ msgid "Template:"
 msgstr "Modelo:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Xoves"
 
@@ -5772,14 +6007,14 @@ msgid "Time format:"
 msgstr "Formato da hora:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Martes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Mércores"
 
@@ -5858,323 +6093,466 @@ msgstr "Mé_r"
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:269
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 "Cop_iar localmente os contidos do calendario para unha operación sen conexión"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "Cop_iar localmente os contidos da lista de tarefas para unha operación sen "
 "conexión"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "Copia_r localmente os contidos da lista de notas para unha operación sen "
 "conexión"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
+#: ../calendar/gui/dialogs/calendar-setup.c:343
 msgid "Colo_r:"
 msgstr "Co_r:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Task List"
 msgstr "Lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:389
 msgid "Memo List"
 msgstr "Lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "Calendar Properties"
 msgstr "Propiedades do calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "New Calendar"
 msgstr "Novo calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "Task List Properties"
 msgstr "Propiedades de lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "New Task List"
 msgstr "Nova lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "Memo List Properties"
 msgstr "Propiedades de lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "New Memo List"
 msgstr "Nova lista de notas"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Eliminouse este evento."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Eliminouse esta tarefa."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:66
 msgid "This memo has been deleted."
 msgstr "Eliminouse esta nota."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s Realizou modificacións. Quere esquecer estas modificacións e pechar o "
 "editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Non realizou modificacións, quere pechar o editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Este evento foi modificado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Modificouse esta tarefa."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:90
 msgid "This memo has been changed."
 msgstr "Esta nota foi modificado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Realizou modificacións. Quere esquecer estas modificacións e actualizar "
 "o editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Non realizou modificacións, quere actualizar o editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:518
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Erro de validación: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " para "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (Terminada "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "Terminada "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (Pendente "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "Pendente "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "Mensaxe anexa - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:385 ../composer/e-msg-composer.c:1725
-#: ../composer/e-msg-composer.c:1944
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
+#: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Mensaxe anexa"
 msgstr[1] "%d mensaxes anexas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:456 ../composer/e-msg-composer.c:2012
-#: ../mail/em-folder-tree.c:999 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2046
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:2014
-#: ../mail/em-folder-tree.c:1001 ../mail/message-list.c:2048
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "Cancelar o _arrastre"
 
-#: ../calendar/gui/dialogs/comp-editor.c:661
-#: ../calendar/gui/dialogs/comp-editor.c:2856 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:378
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:823
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "Non se puido actualizar o obxecto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:973
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "Editar Cita"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "Reunión - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "Cita - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tarefa asignada - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "Tarefa - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "Nota - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "Sen resumo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "Prema aquí para pechar a ventá actual"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "Copiar o texto seleccionado ao portapapeis"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "Cortar o texto seleccionado para o portapapeis"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "Prema aquí para ver a axuda dispoñible"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "Pegar texto desde o portapapeis"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "Prema aquí para gardar a ventá actual"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "Seleccionar todo o texto"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "_Clasificación"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_Ficheiro"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_Axuda"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "_Inserir"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "_Opcións"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
+msgid "_View"
+msgstr "_Ver"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_Anexo..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "Prema aquí para anexar un ficheiro"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "_Categorías"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr " Alterna entre se se mostran as categorías ou non"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "_Fuso horario"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "Alterna entre se se mostra ou non o campo Fuso horario"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "Pú_blico"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "Clasificar como público"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "_Privado"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "Clasificar como privado"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "Clasificar como confidencial"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "Campo _rol"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "Alterna entre se se mostra o campo Rol ou non"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Alterna entre se se mostra o campo RSVP ou non"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "Campo de e_stado"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "Alterna entre se se mostra o campo Estado ou non"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "Campo _tipo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Alterna entre se se mostra o campo Tipo de participante ou non"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "Docu_mentos recentes"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "Anexar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Anexo"
 msgstr[1] "<b>%d</b> Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1005
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "Ocultar a _barra de anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1008
-#: ../calendar/gui/dialogs/comp-editor.c:1591
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "Mostrar a _barra de anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "E_liminar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:2036
 #: ../composer/e-msg-composer.c:1049
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Engadir anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1615
-#: ../mail/em-format-html-display.c:2218
+#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../mail/em-format-html-display.c:2194
 msgid "Show Attachments"
 msgstr "Mostrar anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1616
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "Prema a tecla de espazo para alternar a barra de anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2227
-#: ../calendar/gui/dialogs/comp-editor.c:2270
-msgid "Edit Appointment"
-msgstr "Editar Cita"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Meeting - %s"
-msgstr "Reunión - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2235
-#: ../calendar/gui/dialogs/comp-editor.c:2278
-#, c-format
-msgid "Appointment - %s"
-msgstr "Cita - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Tarefa asignada - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2241
-#: ../calendar/gui/dialogs/comp-editor.c:2284
-#, c-format
-msgid "Task - %s"
-msgstr "Tarefa - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#: ../calendar/gui/dialogs/comp-editor.c:2287
-#, c-format
-msgid "Memo - %s"
-msgstr "Nota - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2255
-#: ../calendar/gui/dialogs/comp-editor.c:2297
-msgid "No summary"
-msgstr "Sen resumo"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2945
-#: ../calendar/gui/dialogs/comp-editor.c:2999
-#: ../calendar/gui/dialogs/comp-editor.c:3023
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "As modificacións realizadas neste elemento pódense rexeitar se chega unha "
 "actualización"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3052
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "Non é posible usar a versión actual!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "Non se puido abrir a orixe"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "Non se puido abrir o destino"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "O destino é só de lectura"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:202
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "E_liminar este elemento das caixas de correo de todos os outros "
 "destinatarios?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:53
 msgid "The event could not be deleted due to a corba error"
 msgstr "O evento non se puido eliminar debido a un erro de Corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The task could not be deleted due to a corba error"
 msgstr "A tarefa non se puido eliminar debido a un erro de Corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The memo could not be deleted due to a corba error"
 msgstr "A nota non se puido eliminar debido a un erro de Corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:62
 msgid "The item could not be deleted due to a corba error"
 msgstr "O elemento non se puido eliminar debido a un erro de Corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:69
 msgid "The event could not be deleted because permission was denied"
 msgstr "O evento non se puido eliminar porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The task could not be deleted because permission was denied"
 msgstr "A tarefa non se puido eliminar porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The memo could not be deleted because permission was denied"
 msgstr "A nota non se puido eliminar porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The item could not be deleted because permission was denied"
 msgstr "O elemento non se puido eliminar porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:85
 msgid "The event could not be deleted due to an error"
 msgstr "O evento non se puido eliminar debido a un erro"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:88
 msgid "The task could not be deleted due to an error"
 msgstr "A tarefa non se puido eliminar debido a un erro"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:91
 msgid "The memo could not be deleted due to an error"
 msgstr "A nota non se puido eliminar debido a un erro"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:94
 msgid "The item could not be deleted due to an error"
 msgstr "O elemento non se puido eliminar debido a un erro"
 
@@ -6183,7 +6561,7 @@ msgid "Contacts..."
 msgstr "Contactos..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To:"
 msgstr "Delegar en:"
 
@@ -6191,134 +6569,181 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Introducir delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "_Alarmas"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr ""
+"Prema aquí para configurar ou desconfigurar as alarmas para este evento"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "_Recorrencia"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "Converter en evento recorrente"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Opcións de envío"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "Inserir opcións avanzadas de envío"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "Evento de _día completo"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "Alterna entre se se ten un evento de día completo ou non"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "Mostrar hora como _ocupada"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "Alterna entre se se mostran as horas como ocupadas ou non"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "_Dispoñibilidade"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "Consultar información de dispoñibilidade para os participantes"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "_Cita"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Recorrencia"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "Este evento posúe alarmas"
 
-#: ../calendar/gui/dialogs/event-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "Evento sen data de comezo"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "Evento sen data de finalización"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "A data de comezo é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "A data de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "A hora de comezo é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "A hora de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador seleccionado xa non ten unha conta."
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Requírese un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Requírese polo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Engadir "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Non foi posible abrir o calendario '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Está actuando en nome de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d día antes da cita"
 msgstr[1] "%d días antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora antes da cita"
 msgstr[1] "%d horas antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes da cita"
 msgstr[1] "%d minutos antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "Personalizar"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1424
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:94
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2016
-#: ../widgets/misc/e-cell-date-edit.c:308 ../widgets/misc/e-dateedit.c:1533
-#: ../widgets/misc/e-dateedit.c:1747
+#: ../plugins/itip-formatter/itip-formatter.c:2022
+#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
 #: ../widgets/misc/e-signature-combo-box.c:69
 msgid "None"
 msgstr "Ningún"
@@ -6391,28 +6816,24 @@ msgstr "_Cambiar organizador"
 msgid "Co_ntacts..."
 msgstr "Co_ntactos..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Organizador"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Nota"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Non é posible abrir as notas en '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1558
-#: ../mail/em-format-html.c:1616 ../mail/em-format-html.c:1642
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1561
+#: ../mail/em-format-html.c:1619 ../mail/em-format-html.c:1645
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "Para"
 
@@ -6430,58 +6851,58 @@ msgid "_Description:"
 msgstr "_Descrición:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Está modificando un evento recorrente. Que quere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Está delegando un evento recorrente. Que quere delegar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Está modificando unha tarefa recorrente. Que quere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Está modificando unha nota recorrente. Que quere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "Unicamente esta instancia "
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "Esta instancia e as anteriores"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "Esta instancia e as futuras"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "Todas as instancias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita contén recorrencias que o Evolution non pode editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "A data da recorrencia non é válida"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "en"
 
@@ -6489,7 +6910,7 @@ msgstr "en"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "primeiro"
 
@@ -6498,7 +6919,7 @@ msgstr "primeiro"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "segundo"
 
@@ -6506,7 +6927,7 @@ msgstr "segundo"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "terceiro"
 
@@ -6514,7 +6935,7 @@ msgstr "terceiro"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "cuarto"
 
@@ -6522,13 +6943,13 @@ msgstr "cuarto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "último"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Outra data"
 
@@ -6536,7 +6957,7 @@ msgstr "Outra data"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "Do 1º ao 10º"
 
@@ -6544,7 +6965,7 @@ msgstr "Do 1º ao 10º"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "do 11º ao 20º"
 
@@ -6552,45 +6973,45 @@ msgstr "do 11º ao 20º"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "Do 21º ao 31º"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "día"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "ocorrencias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Engadir excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Non se puido obter unha selección para modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Modificar excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Non se puido obter unha selección para eliminar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Data e hora"
 
@@ -6641,12 +7062,12 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "A data de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "Páxina web"
 
@@ -6661,51 +7082,55 @@ msgstr "<span weight=\"bold\">Estado</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:369
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "Terminada"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:271
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Alto"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "En progreso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:275
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Baixo"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:273
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Non Iniciada"
 
@@ -6718,7 +7143,7 @@ msgid "Stat_us:"
 msgstr "Esta_do:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Indefinida"
 
@@ -6735,25 +7160,37 @@ msgstr "_Prioridade:"
 msgid "_Web Page:"
 msgstr "Páxina _Web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "Detalles do e_stado"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+msgid "Click to change or view the status details of the task"
+msgstr "Prema para modificar ou ver os detalles do estado da tarefa"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "Opción_s de envío"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Detalles da tarefa"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "A data de vencemento é incorrecta"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Non é posible abrir as tarefas en '%s'."
@@ -6779,7 +7216,7 @@ msgid "_Due date:"
 msgstr "_Data de vencemento:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6787,142 +7224,126 @@ msgstr[0] "%d día"
 msgstr[1] "%d días"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "Acción descoñecida para realizar "
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s antes do comezo da cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s despois do comezo da cita"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ao comezo da cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s antes de finalizar a cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s despois de finalizar a cita"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ao finalizar a cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s at %s"
 msgstr "%s a %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de activador descoñecido"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3329
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:134
-#: ../calendar/gui/e-cal-component-preview.c:176 ../filter/filter-rule.c:805
-#: ../shell/e-shell-folder-title-bar.c:593
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
 msgid "Untitled"
 msgstr "Sen título"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:186
-#: ../calendar/gui/e-cal-component-preview.c:216
-#: ../calendar/gui/e-cal-component-preview.c:227
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
 msgstr "Data de inicio:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-#: ../calendar/gui/e-cal-component-preview.c:290
-#: ../calendar/gui/e-itip-control.c:1201
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-itip-control.c:1218
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Descrición:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:235
-#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "Páxina Web:"
 
-#: ../calendar/gui/e-cal-component-preview.c:209
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-cal-component-preview.c:210
+#: ../calendar/gui/e-itip-control.c:1162
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Resumo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Data de vencemento:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:245
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:268
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Prioridade:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Público"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Privado"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Confidencial"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Data final"
@@ -6932,21 +7353,14 @@ msgstr "Data final"
 msgid "Start Date"
 msgstr "Data de inicio"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:365
-msgid "Summary"
-msgstr "Resumo"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Ocupado"
 
@@ -6961,16 +7375,16 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:747
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:746
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Si"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:165
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Non"
@@ -6978,16 +7392,16 @@ msgstr "Non"
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
 #: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
-#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
+#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2041
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:742
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "Descoñecido"
@@ -7000,27 +7414,27 @@ msgstr "Recorrencia"
 msgid "Assigned"
 msgstr "Asignada"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:427
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
 msgid "Save As..."
 msgstr "Gardar como..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2052
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2028
 msgid "Select folder to save selected attachments..."
 msgstr "Seleccione o cartafol para gardar os anexos seleccionados..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:455
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
 #, c-format
 msgid "untitled_image.%s"
-msgstr "imaxe_sen título.%s"
+msgstr "imaxe_sen_título.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:572 ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "_Gardar como..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:573
-#: ../mail/em-popup.c:584
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
+#: ../mail/em-popup.c:574
 msgid "Set as _Background"
 msgstr "Definir como _fondo"
 
@@ -7028,131 +7442,157 @@ msgstr "Definir como _fondo"
 msgid "_Save Selected"
 msgstr "_Gardar os seleccionados"
 
-#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:848
+#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* Sen resumo *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organizador: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:377
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organizador: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "Comeza: "
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "Vence: "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:681 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Eliminar os obxectos seleccionados"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:811 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Actualizando obxectos"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1237 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:277
+#: ../calendar/gui/e-calendar-table.c:1348
+#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1670
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "Nova _Tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Abrir páxina _web"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1673 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "Imp_rimir..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_rtar"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1676
-#: ../calendar/gui/e-calendar-view.c:1695 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Asignar Tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Remitir como iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminada"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar as tarefas seleccionadas como terminadas"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "_Marcar como non terminada"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marcar as tarefas seleccionadas como non terminadas"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "E_liminar as tarefas seleccionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Prema para engadir unha tarefa"
@@ -7175,7 +7615,8 @@ msgid "Due date"
 msgstr "Data de vencemento"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "Prioridade"
 
@@ -7183,112 +7624,93 @@ msgstr "Prioridade"
 msgid "Start date"
 msgstr "Data de inicio"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:546
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Estado"
-
-#: ../calendar/gui/e-calendar-view.c:1356
+#: ../calendar/gui/e-calendar-view.c:1349
 msgid "Moving items"
 msgstr "Movendo elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1358
+#: ../calendar/gui/e-calendar-view.c:1351
 msgid "Copying items"
 msgstr "Copiando elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: ../calendar/gui/e-calendar-view.c:1668
+#: ../calendar/gui/e-calendar-view.c:1661
 msgid "New All Day _Event"
 msgstr "Novo _evento de día completo"
 
-#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1662
 msgid "New _Meeting"
 msgstr "Nova _reunión"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "_Current View"
 msgstr "_Visualización actual"
 
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1675
 msgid "Select T_oday"
 msgstr "Seleccionar _hoxe"
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1676
 msgid "_Select Date..."
 msgstr "_Seleccionar data..."
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Pri_nt..."
 msgstr "_Imprimir..."
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar a un calendario..."
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver ao calendario..."
 
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Delegate Meeting..."
 msgstr "_Delegar reunión..."
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "_Schedule Meeting..."
 msgstr "_Programar reunión..."
 
-#: ../calendar/gui/e-calendar-view.c:1703
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "_Forward as iCalendar..."
 msgstr "_Remitir como iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1704
+#: ../calendar/gui/e-calendar-view.c:1697
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1705 ../mail/em-folder-view.c:1337
-#: ../mail/em-popup.c:577 ../mail/em-popup.c:588
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
+#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1703
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta ocorrencia _movible"
 
-#: ../calendar/gui/e-calendar-view.c:1711 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Eliminar esta _ocorrencia"
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1705
 msgid "Delete _All Occurrences"
 msgstr "Eliminar _todas as ocorrencias"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2234
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organizador: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2238
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organizador: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2254 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Localización: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2288
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -7316,7 +7738,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:592
+#: ../calendar/gui/e-day-view-time-item.c:589
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisións de minuto"
@@ -7327,44 +7749,34 @@ msgstr "%02i divisións de minuto"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1528
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1672
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:772 ../calendar/gui/e-week-view.c:511
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:775 ../calendar/gui/e-week-view.c:514
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Si. (Recorrencia complexa)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Cada día"
 msgstr[1] "Cada %d días"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
@@ -7372,9 +7784,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "Cada semana"
 msgstr[1] "Cada %d semanas"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7382,51 +7792,35 @@ msgstr[0] "Cada semana en "
 msgstr[1] "Cada %d semanas en "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " e "
 
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "O %s día de "
 
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "O %s %s de "
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "cada mes"
 msgstr[1] "cada %d meses"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Cada ano"
 msgstr[1] "Cada %d anos"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7434,342 +7828,342 @@ msgstr[0] " un total de %d vez"
 msgstr[1] " un total de %d veces"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", finalizando en "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Comeza"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "Finaliza"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "Vence"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "información de iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "Erro de iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
-#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:521
+#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "Unha persoa descoñecida"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1126
+#: ../calendar/gui/e-itip-control.c:1143
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Revise a seguinte información, e escolla unha acción do menú de abaixo."
 
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/itip-utils.c:664
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:702
-#: ../plugins/itip-formatter/itip-formatter.c:2032
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/itip-utils.c:705 ../calendar/gui/itip-utils.c:734
-#: ../plugins/itip-formatter/itip-formatter.c:2035
+#: ../calendar/gui/e-itip-control.c:1199
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: ../calendar/gui/e-itip-control.c:1266
+#: ../calendar/gui/e-itip-control.c:1283
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr ""
 "A reunión cancelouse, porén non se puido encontrar nos seus calendarios"
 
-#: ../calendar/gui/e-itip-control.c:1268
+#: ../calendar/gui/e-itip-control.c:1285
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "A tarefa cancelouse, porén non se puido encontrar nas súas listas de tarefas"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publicou información sobre unha reunión."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Información da reunión"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1370
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> solicita a presenza de %s nunha reunión."
 
-#: ../calendar/gui/e-itip-control.c:1355
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> require a súa presenza nunha reunión."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Proposta de reunión"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> quere que se lle engada a unha reunión existente."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Actualización da reunión"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> quere recibir a última información sobre a reunión."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Solicitude de actualización da reunión"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> respondeu a unha petición de reunión."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Resposta de reunión"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> cancelou unha reunión."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Cancelación da reunión"
 
-#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1528
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> enviou unha mensaxe inintelixible."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Mensaxe de reunión incorrecta"
 
-#: ../calendar/gui/e-itip-control.c:1422
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> publicou información da tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Información da tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1447
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> require a %s que efectúe unha tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> require que efectúe unha tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Proposta de tarefa"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> quere que se lle engada a unha tarefa existente."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Actualización de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> quere recibir a última información sobre a tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Solicitude de actualización de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> respondeu a unha asignación de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Resposta de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> cancelou unha tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "Cancelación de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Mensaxe de tarefa incorrecta"
 
-#: ../calendar/gui/e-itip-control.c:1496
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publicou información de dispoñibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Información de dispoñibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1501
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> require a súa información de dispoñibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Solicitude de dispoñibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> respondeu a unha solicitude de dispoñibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Resposta de dispoñibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe incorrecta de dispoñibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1588
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message does not appear to be properly formed"
 msgstr "A mensaxe non parece estar formada apropiadamente"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "Esta mensaxe só contén solicitudes non soportadas."
 
-#: ../calendar/gui/e-itip-control.c:1680
+#: ../calendar/gui/e-itip-control.c:1697
 msgid "The attachment does not contain a valid calendar message"
 msgstr "O anexo non contén unha mensaxe de calendario válida"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "O anexo non ten elementos de calendario visibles"
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "Actualización terminada\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "O obxecto non é válido e non pode ser actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta resposta non é dun participante actual. Quere engadilo como "
 "participante?"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "O estado do participante non se puido actualizar debido a un estado non "
 "válido!\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "Estado do participante actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
+#: ../calendar/gui/e-itip-control.c:2080
 #: ../plugins/itip-formatter/itip-formatter.c:1254
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "O estado do participante non se puido actualizar porque xa non existe o "
 "elemento"
 
-#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "Elemento enviado!\n"
 
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "Non se puido enviar o elemento!\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Seleccione unha acción:"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../calendar/gui/e-itip-control.c:2332
+#: ../calendar/gui/e-itip-control.c:2355
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:2334
+#: ../calendar/gui/e-itip-control.c:2357
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Rexeitar"
 
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Enviar información de dispoñibilidade"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Actualizar o estado do interlocutor"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Enviar a última información"
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
@@ -7798,112 +8192,112 @@ msgstr "Cargando calendario..."
 msgid "Server Message:"
 msgstr "Mensaxe do servidor:"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Participantes requiridos"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Participantes opcionais"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Recursos"
 
-#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "Participantes"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/e-meeting-store.c:741 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
 msgid "Individual"
 msgstr "Individual"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grupo"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:967
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:983
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
+#: ../calendar/gui/print.c:984
 msgid "Room"
 msgstr "Sala"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/print.c:998
 msgid "Chair"
 msgstr "Presidente"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/e-meeting-store.c:744 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
 msgid "Required Participant"
 msgstr "Participante requirido"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:1000
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "Non-participante"
 
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../calendar/gui/e-meeting-store.c:754
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:753
 msgid "Needs Action"
 msgstr "Necesita acción"
 
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Tentative"
 msgstr "Provisional"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/itip-utils.c:708
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/itip-utils.c:673
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "Delegado"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:492
+#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr "Participante                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:534
+#: ../calendar/gui/e-meeting-list-view.c:533
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
 msgstr "En progreso"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:473
-#: ../calendar/gui/e-meeting-time-sel.c:2138
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -7912,7 +8306,7 @@ msgstr "%A, %d de %B de %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:477
-#: ../calendar/gui/e-meeting-time-sel.c:2169
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -7922,74 +8316,70 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "Fóra da oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "Sen información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:431
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "Par_ticipantes..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:452
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "O_pcións"
 
-#: ../calendar/gui/e-meeting-time-sel.c:469
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "Mostrar _só as horas de traballo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "Mostrar _reducido"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "_Actualizar dispoñibilidade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:509
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "Seleccionar _automaticamente"
 
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:559
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "_Todas as persoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "Todas as _persoas e un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:577
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "Persoas _requiridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:586
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "Persoas requiridas e _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:622
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:649
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "Hora de _finalización:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Participante"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Prema aquí para engadir un participante"
@@ -8022,8 +8412,8 @@ msgstr "E_liminar as notas seleccionadas"
 msgid "Click to add a memo"
 msgstr "Prema para engadir unha nota"
 
-#: ../calendar/gui/e-memos.c:761 ../calendar/gui/e-tasks.c:911
-#: ../calendar/gui/gnome-cal.c:2865
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/gnome-cal.c:2864
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8032,84 +8422,84 @@ msgstr ""
 "Erro en %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:810
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "Cargando notas"
 
-#: ../calendar/gui/e-memos.c:891
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Abrindo notas en %s"
 
-#: ../calendar/gui/e-memos.c:1063 ../calendar/gui/e-tasks.c:1322
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "Eliminando os obxectos seleccionados..."
 
-#: ../calendar/gui/e-tasks.c:964
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "Cargando tarefas"
 
-#: ../calendar/gui/e-tasks.c:1054
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas en %s"
 
-#: ../calendar/gui/e-tasks.c:1299
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "Finalizando tarefas..."
 
-#: ../calendar/gui/e-tasks.c:1349
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "Expurgando"
 
-#: ../calendar/gui/e-timezone-entry.c:134
+#: ../calendar/gui/e-timezone-entry.c:130
 msgid "Select Timezone"
 msgstr "Seleccionar fuso horario"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: ../calendar/gui/gnome-cal.c:831
+#: ../calendar/gui/gnome-cal.c:830
 msgid "Updating query"
 msgstr "Actualizando consulta"
 
-#: ../calendar/gui/gnome-cal.c:2502
+#: ../calendar/gui/gnome-cal.c:2501
 msgid "_Custom View"
 msgstr "Visualización _personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2503
+#: ../calendar/gui/gnome-cal.c:2502
 msgid "_Save Custom View"
 msgstr "_Gardar visualización personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2507
 msgid "_Define Views..."
 msgstr "_Definir visualizacións..."
 
-#: ../calendar/gui/gnome-cal.c:2689
+#: ../calendar/gui/gnome-cal.c:2688
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Cargando citas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2708
+#: ../calendar/gui/gnome-cal.c:2707
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Cargando tarefas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2717
+#: ../calendar/gui/gnome-cal.c:2716
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Cargando notas en %s"
 
-#: ../calendar/gui/gnome-cal.c:2824
+#: ../calendar/gui/gnome-cal.c:2823
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: ../calendar/gui/gnome-cal.c:3780
+#: ../calendar/gui/gnome-cal.c:3779
 msgid "Purging"
 msgstr "Depurando"
 
@@ -8169,137 +8559,144 @@ msgstr "Setembro"
 msgid "_Select Today"
 msgstr "_Seleccionar hoxe"
 
-#: ../calendar/gui/itip-utils.c:439 ../calendar/gui/itip-utils.c:491
-#: ../calendar/gui/itip-utils.c:579
+#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../calendar/gui/itip-utils.c:544
 msgid "An organizer must be set."
 msgstr "Débese definir un organizador."
 
-#: ../calendar/gui/itip-utils.c:483
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "É necesario polo menos un participante"
 
-#: ../calendar/gui/itip-utils.c:661 ../calendar/gui/itip-utils.c:776
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "Información do evento"
 
-#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:779
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Información da tarefa"
 
-#: ../calendar/gui/itip-utils.c:665 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "Información da nota"
 
-#: ../calendar/gui/itip-utils.c:667 ../calendar/gui/itip-utils.c:800
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Información de dispoñibilidade"
 
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Información do calendario"
 
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "Actualizado"
 
-#: ../calendar/gui/itip-utils.c:726
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: ../calendar/gui/itip-utils.c:730
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
-#: ../calendar/gui/itip-utils.c:797
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Información de dispoñibilidade (de %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "Información de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:976
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante no evento."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:465
 msgid "_New Memo List"
 msgstr "_Nova lista de notas"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:545
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d nota"
 msgstr[1] "%d notas"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d seleccionada"
 msgstr[1] ", %d seleccionada"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:594
 msgid "Failed upgrading memos."
 msgstr "Fallou ao actualizar as notas."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:954
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Non é posible abrir a lista de notas '%s' para crear eventos e reunións"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:967
 msgid "There is no calendar available for creating memos"
 msgstr "Non hai un calendario dispoñible para crear notas"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1077
 msgid "Memo Source Selector"
 msgstr "Selector de orixe de notas"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Nova nota"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
 msgstr "N_ota"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Crear unha nova nota"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Nova nota compartida"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "Nota _compartida"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Crear unha nova nota compartida"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Nova lista de notas"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "Li_sta de notas"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Crear unha lista de notas nova"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
 msgstr "Imprimir notas"
 
-#: ../calendar/gui/migration.c:162
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "Os seguintes 7 días"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8311,7 +8708,7 @@ msgstr ""
 "\n"
 "Agarde mentres o Evolution migra os seus cartafoles..."
 
-#: ../calendar/gui/migration.c:166
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8324,25 +8721,25 @@ msgstr ""
 "Agarde mentres o Evolution migra os seus cartafoles..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:780 ../calendar/gui/migration.c:948
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 "Non é posible migrar a configuración antiga desde evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:809
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Non se puido migrar o calendario `%s'"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:977
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Non se puido migrar as tarefas `%s'"
 
-#: ../calendar/gui/migration.c:1232
+#: ../calendar/gui/migration.c:1227
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
@@ -8502,119 +8899,126 @@ msgstr "Ve"
 msgid "Sa"
 msgstr "Sá"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Contactos: "
 
 #. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:2762
 msgid "Upcoming Appointments"
 msgstr "Citas próximas"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:456
 msgid "_New Task List"
 msgstr "_Nova lista de tarefas"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:536
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:585
 msgid "Failed upgrading tasks."
 msgstr "Fallou ao actualizar as tarefas."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:942
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Non é posible abrir a lista de tarefas '%s' para crear eventos e reunións"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:955
 msgid "There is no calendar available for creating tasks"
 msgstr "Non hai ningún calendario dispoñible para crear tarefas"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1066
 msgid "Task Source Selector"
 msgstr "Selector de orixe de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: ../calendar/gui/tasks-component.c:1328
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "_Tarefa"
+
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Crear unha tarefa nova"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Nova tarefa asignada"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarefa asigna_da"
 
-#: ../calendar/gui/tasks-component.c:1336
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Crear unha nova tarefa asignada"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Nova lista de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
 msgstr "Lista de tare_fas"
 
-#: ../calendar/gui/tasks-component.c:1344
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Crear unha lista de tarefas nova"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../calendar/gui/tasks-control.c:452
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8626,49 +9030,70 @@ msgstr ""
 "\n"
 "Está seguro de que quere eliminar estas tarefas?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1133
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "Non preguntar de novo."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Imprimir tarefas"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% rematado"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "En progreso"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "é maior que"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "é menor que"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Citas e reunións"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1573
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1578
 msgid "Opening calendar"
 msgstr "Abrir calendario"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "Ficheiros iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Importador de iCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "Aviso!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "Ficheiros vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Importador de vCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "Eventos de calendario"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador intelixente do calendario do Evolution"
 
@@ -10210,201 +10635,196 @@ msgstr "Non se puido gardar automaticamente o ficheiro"
 msgid "Unable to retrieve message from editor"
 msgstr "Non é posible obter a mensaxe do editor"
 
-#: ../composer/e-composer-actions.c:46
+#: ../composer/e-composer-actions.c:47
 msgid "Insert Attachment"
 msgstr "Inserir anexo"
 
-#: ../composer/e-composer-actions.c:50
+#: ../composer/e-composer-actions.c:51
 msgid "A_ttach"
 msgstr "A_nexar"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:143
 msgid "Untitled Message"
 msgstr "Mensaxe sen título"
 
-#: ../composer/e-composer-actions.c:464 ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "_Anexo..."
-
-#: ../composer/e-composer-actions.c:466
+#: ../composer/e-composer-actions.c:474
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: ../composer/e-composer-actions.c:471 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:481
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:478 ../mail/em-folder-view.c:1344
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: ../composer/e-composer-actions.c:485 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
 #: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Pre_visualización da impresión"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:502
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:507
 msgid "Save _As..."
 msgstr "Gardar _como..."
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:509
 msgid "Save the current file with a different name"
 msgstr "Gardar o ficheiro actual cun nome diferente"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:514
 msgid "Save _Draft"
 msgstr "Gardar _borrador"
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:516
 msgid "Save as draft"
 msgstr "Gardar como borrador"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:521
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:523
 msgid "Send this message"
 msgstr "Enviar esta mensaxe"
 
-#: ../composer/e-composer-actions.c:520 ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "Opción_s de envío"
-
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:530
 msgid "Insert Send options"
 msgstr "Introducir opcións de envío"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "Nova _mensaxe"
+
+#: ../composer/e-composer-actions.c:537
+msgid "Open New Message window"
+msgstr "Abrir unha ventá de nova mensaxe"
+
+#: ../composer/e-composer-actions.c:544
 msgid "Character _Encoding"
 msgstr "_Codificación dos caracteres"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:551
 msgid "_Security"
 msgstr "_Seguridade"
 
-#: ../composer/e-composer-actions.c:546
+#: ../composer/e-composer-actions.c:561
 msgid "PGP _Encrypt"
 msgstr "C_ifrar con PGP"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:563
 msgid "Encrypt this message with PGP"
 msgstr "Cifrar esta mensaxe con PGP"
 
-#: ../composer/e-composer-actions.c:554
+#: ../composer/e-composer-actions.c:569
 msgid "PGP _Sign"
 msgstr "A_sinar con PGP"
 
-#: ../composer/e-composer-actions.c:556
+#: ../composer/e-composer-actions.c:571
 msgid "Sign this message with your PGP key"
 msgstr "Asinar esta mensaxe coa súa chave PGP"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:577
 msgid "_Prioritize Message"
 msgstr "_Mensaxe prioritaria"
 
-#: ../composer/e-composer-actions.c:564
+#: ../composer/e-composer-actions.c:579
 msgid "Set the message priority to high"
 msgstr "Definir a prioridade da mensaxe como alta"
 
-#: ../composer/e-composer-actions.c:570
-#, fuzzy
+#: ../composer/e-composer-actions.c:585
 msgid "Re_quest Read Receipt"
-msgstr "_Requirir confirmación de lectura"
+msgstr "Re_quirir confirmación de lectura"
 
-#: ../composer/e-composer-actions.c:572
+#: ../composer/e-composer-actions.c:587
 msgid "Get delivery notification when your message is read"
 msgstr "Obter unha notificación de entrega cando se lea a súa mensaxe"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:593
 msgid "S/MIME En_crypt"
 msgstr "_Cifrar con S/MIME"
 
-#: ../composer/e-composer-actions.c:580
+#: ../composer/e-composer-actions.c:595
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Cifrar esta mensaxe co seu certificado de cifrado S/MIME"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:601
 msgid "S/MIME Sig_n"
 msgstr "Si_natura S/MIME"
 
-#: ../composer/e-composer-actions.c:588
+#: ../composer/e-composer-actions.c:603
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Asinar esta mensaxe co seu certificado de sinatura S/MIME"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:609
 msgid "_Bcc Field"
 msgstr "Campo _Cco"
 
-#: ../composer/e-composer-actions.c:596
+#: ../composer/e-composer-actions.c:611
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo CCO"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:617
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ../composer/e-composer-actions.c:604
+#: ../composer/e-composer-actions.c:619
 msgid "Toggles whether the CC field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo CC"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:625
 msgid "_From Field"
 msgstr "Campo _Desde"
 
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:627
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Alterna entre se se mostra ou non o selector do campo De"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:633
 msgid "_Post-To Field"
 msgstr "Campo _Publicar-en"
 
-#: ../composer/e-composer-actions.c:620
+#: ../composer/e-composer-actions.c:635
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo Publicar en"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:641
 msgid "_Reply-To Field"
 msgstr "Campo _Responder a"
 
-#: ../composer/e-composer-actions.c:628
+#: ../composer/e-composer-actions.c:643
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo Responder a"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:649
 msgid "_Subject Field"
 msgstr "Campo _Asunto"
 
-#: ../composer/e-composer-actions.c:636
+#: ../composer/e-composer-actions.c:651
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Alterna entre se se mostra o campo Asunto ou non"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:657
 msgid "_To Field"
 msgstr "Campo _Para"
 
-#: ../composer/e-composer-actions.c:644
+#: ../composer/e-composer-actions.c:659
 msgid "Toggles whether the To field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo Para"
 
-#: ../composer/e-composer-actions.c:685 ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "Anexar"
-
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
@@ -10492,8 +10912,8 @@ msgstr ""
 "Non se pode cifrar a mensaxe saínte: non hai un certificado de cifrado "
 "definido para esta conta"
 
-#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1936
-#: ../mail/em-format-html-display.c:2426 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1912
+#: ../mail/em-format-html-display.c:2402 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -10504,11 +10924,11 @@ msgstr[1] "Anexos"
 msgid "Hide _Attachment Bar"
 msgstr "Ocultar a _barra de anexos"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2734
+#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:4009
+#: ../composer/e-msg-composer.c:4056
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10656,23 +11076,27 @@ msgstr "Non pode anexar o ficheiro `{0}' a esta mensaxe."
 msgid "You need to configure an account before you can compose mail."
 msgstr "Necesita configurar unha conta antes de poder escribir un correo."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Continuar editando"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_Non recuperar"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:318
+#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
 msgid "_Recover"
 msgstr "_Recuperar"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Gardar mensaxe"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "_Gardar borrador"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Correo e calendario do Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Suite de Groupware"
 
@@ -10688,31 +11112,39 @@ msgstr "cartón de enderezo"
 msgid "calendar information"
 msgstr "información de calendario"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Erro do Evolution"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Aviso do Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Información do Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Consulta do Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:458
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Erro interno: requirido un erro descoñecido '%s'"
 
-#: ../e-util/e-plugin.c:308 ../mail/em-account-prefs.c:489
-#: ../mail/em-composer-prefs.c:982
-#: ../plugins/plugin-manager/plugin-manager.c:331
+#: ../e-util/e-logger.c:154
+msgid "Component"
+msgstr "Compoñente"
+
+#: ../e-util/e-logger.c:155
+msgid "Name of the component being logged"
+msgstr "O nome da compoñente que rexistrar"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../plugins/plugin-manager/plugin-manager.c:339
 #: ../plugins/publish-calendar/publish-calendar.c:689
 msgid "Enabled"
 msgstr "Activado"
@@ -10721,15 +11153,15 @@ msgstr "Activado"
 msgid "Whether the plugin is enabled"
 msgstr "Se o complemento está activado"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "Ocorreu un erro ao imprimir"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "O sistema de impresión informou dos seguintes detalles sobre o erro:"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:171
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
@@ -10763,47 +11195,47 @@ msgstr "Sobrescribir o ficheiro?"
 msgid "_Overwrite"
 msgstr "S_obrescribir"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "I_mportante"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "_Traballo"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "_Persoal"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "_Tarefas pendentes"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "_Máis tarde"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "_Nome da etiqueta:"
 
-#: ../e-util/e-util-labels.c:340
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "Editar etiqueta"
 
-#: ../e-util/e-util-labels.c:340
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "Engadir etiqueta"
 
-#: ../e-util/e-util-labels.c:359
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "O nome da etiqueta non pode estar baleiro."
 
-#: ../e-util/e-util-labels.c:364
+#: ../e-util/e-util-labels.c:356
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
@@ -10817,7 +11249,7 @@ msgstr "Erro de GConf: %s"
 
 #: ../e-util/gconf-bridge.c:1228
 msgid "All further errors shown only on terminal."
-msgstr ""
+msgstr "De agora en adiante, todos os erros amosaranse só no terminal."
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -10935,65 +11367,65 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Seleccione unha hora coa que comparar"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Seleccione un ficheiro"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Proba"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "Nome da r_egra"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Buscar os elementos que cumpran cos seguintes criterios"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "En_gadir regra de filtraxe"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "Se se cumpren todos os criterios"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "Se se cumpre algún criterio"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Buscar elementos:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Todos os relacionados"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Respostas"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Respostas e pais"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Sen resposta nin pai"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "I_ncluír fíos"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Saínte"
 
@@ -11093,7 +11525,7 @@ msgstr "dentro de"
 msgid "months"
 msgstr "meses"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:194
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "segundos"
 
@@ -11105,9 +11537,9 @@ msgstr "a hora actual"
 msgid "the time you specify"
 msgstr "a hora especificada"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:718
 msgid "weeks"
 msgstr "semanas"
 
@@ -11123,7 +11555,7 @@ msgstr "Engadir regra"
 msgid "Edit Rule"
 msgstr "Editar regra"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Nome da regra"
 
@@ -11181,15 +11613,15 @@ msgid "Evolution Network configuration control"
 msgstr "Control de configuración de rede de Evolution"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
-#: ../mail/mail-component.c:757
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../mail/mail-component.c:595 ../mail/mail-component.c:596
+#: ../mail/mail-component.c:760
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Correo"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:502
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "Contas de correo"
 
@@ -11206,12 +11638,12 @@ msgstr "Preferencias da rede"
 msgid "_Mail"
 msgstr "_Correo"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acordo de licenza %s"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -11224,109 +11656,109 @@ msgstr ""
 "para %s que se mostre abaixo\n"
 "e marque a caixa de verificación para aceptalo.\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "Seleccionar cartafol"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:97
+#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:97
 msgid "Autogenerated"
 msgstr "Xerado automaticamente"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "Preguntar por cada mensaxe"
 
-#: ../mail/em-account-editor.c:1825 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../mail/em-account-editor.c:1874 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Recibindo correo"
 
-#: ../mail/em-account-editor.c:2056
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "Verificar automaticamente se hai mensaxes _novas cada"
 
-#: ../mail/em-account-editor.c:2064
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:2238 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: ../mail/em-account-editor.c:2297 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Predeterminados"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2363 ../mail/mail-config.glade.h:130
-#: ../plugins/exchange-operations/exchange-account-setup.c:316
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Seguranza"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2400 ../mail/em-account-editor.c:2491
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "Opcións de recepción"
 
-#: ../mail/em-account-editor.c:2401 ../mail/em-account-editor.c:2492
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "Comprobando se hai mensaxes novas"
 
-#: ../mail/em-account-editor.c:2843 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor de contas"
 
-#: ../mail/em-account-editor.c:2843 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Asistente de contas do Evolution"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[Predeterminado]"
 
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "Nome da conta"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Protocolo"
 
 #: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1154 ../mail/mail-signature-editor.c:478
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "Sen nome"
 
-#: ../mail/em-composer-prefs.c:986
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: ../mail/em-composer-prefs.c:1035
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "Engadir script de sinatura"
 
-#: ../mail/em-composer-prefs.c:1077
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Sinatura(s)"
 
-#: ../mail/em-composer-utils.c:938 ../mail/em-format-quote.c:413
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensaxe reenviada --------"
 
-#: ../mail/em-composer-utils.c:1754
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "un remitente descoñecido"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1801
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11334,11 +11766,11 @@ msgstr ""
 "O ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} ás ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribiu:"
 
-#: ../mail/em-composer-utils.c:1942
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-----Mensaxe orixinal-----"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "_Regras de filtro"
 
@@ -11355,10 +11787,6 @@ msgstr "Asignar cor"
 msgid "Assign Score"
 msgstr "Asignar puntuación"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Anexos"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "Cco"
@@ -11375,10 +11803,6 @@ msgstr "Cc"
 msgid "Completed On"
 msgstr "Completado en"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "contén"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar ao cartafol"
@@ -11392,7 +11816,7 @@ msgid "Date sent"
 msgstr "Data de envío"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11403,10 +11827,6 @@ msgstr "Eliminar"
 msgid "Deleted"
 msgstr "Eliminada"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "non contén"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "non finaliza en"
@@ -11427,10 +11847,6 @@ msgstr "non soa como"
 msgid "does not start with"
 msgstr "non comeza por"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Non existe"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Borrador"
@@ -11439,10 +11855,6 @@ msgstr "Borrador"
 msgid "ends with"
 msgstr "termina en"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Existe"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "existe"
@@ -11455,14 +11867,10 @@ msgstr "Expresión"
 msgid "Follow Up"
 msgstr "Seguimento"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1053
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Importante"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "é"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "é posterior a"
@@ -11475,18 +11883,6 @@ msgstr "é anterior a"
 msgid "is Flagged"
 msgstr "está marcado"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "é maior que"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "é menor que"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "non é"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "non está marcado"
@@ -11508,7 +11904,7 @@ msgstr "Correo non desexado"
 msgid "Junk Test"
 msgstr "Proba de correo non desexado"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "Etiqueta"
 
@@ -11550,7 +11946,7 @@ msgstr "Reproducir son"
 
 #. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Ler"
 
@@ -11623,8 +12019,8 @@ msgid "Stop Processing"
 msgstr "Deter o procesamento"
 
 #: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:95
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:337
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:318
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11635,101 +12031,110 @@ msgid "Unset Status"
 msgstr "Desfacer a definición de estado"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "Entón"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Engadir a_cción"
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:189
 msgid "C_reate Search Folder From Search..."
 msgstr "C_rear un cartafol de busca por busca..."
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:214
 msgid "All Messages"
 msgstr "Todas as mensaxes"
 
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:215
 msgid "Unread Messages"
 msgstr "Mensaxes non lidas"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:217
 msgid "No Label"
 msgstr "Sen etiqueta"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:224
 msgid "Read Messages"
 msgstr "Mensaxes lidas"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:225
 msgid "Recent Messages"
 msgstr "Mensaxes recentes"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:226
 msgid "Last 5 Days' Messages"
 msgstr "Mensaxes dos últimos 5 días"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:227
 msgid "Messages with Attachments"
 msgstr "Mensaxes con anexos"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:228
 msgid "Important Messages"
 msgstr "Mensaxes importantes"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:229
 msgid "Messages Not Junk"
 msgstr "Mensaxes que non son correos non desexados"
 
-#: ../mail/em-folder-browser.c:1148
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "Busca na conta"
 
-#: ../mail/em-folder-browser.c:1201
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "Busca en todas as contas"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:185
+#: ../mail/em-folder-properties.c:173
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Mensaxe non lida:"
-msgstr[1] "Mensaxe non lida:"
+msgstr[1] "Mensaxes non lidas:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:189
+#: ../mail/em-folder-properties.c:177
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Mensaxes totais:"
 msgstr[1] "Mensaxes totais:"
 
-#: ../mail/em-folder-properties.c:205 ../mail/em-folder-properties.c:207
-#, fuzzy
+#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
 msgid "Quota usage"
-msgstr "Mensaxes totais:"
+msgstr "Uso da cota"
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
+#: ../mail/mail-component.c:583
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
+msgid "Inbox"
+msgstr "Caixa de entrada"
 
-#: ../mail/em-folder-properties.c:397
+#: ../mail/em-folder-properties.c:386
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Propiedades do cartafol"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<prema aquí para seleccionar un cartafol>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "_Nome do cartafol:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Cartafoles de busca"
 
@@ -11738,27 +12143,19 @@ msgstr "Cartafoles de busca"
 msgid "UNMATCHED"
 msgstr "NON EQUIVALENCIA"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Borradores"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2537
-#: ../mail/mail-component.c:160
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Caixa de entrada"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Caixa de saída"
 
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Enviado"
 
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Cargando..."
 
@@ -11777,86 +12174,80 @@ msgstr "Cargando..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:373
+#: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:734
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Árbore de cartafoles de correo"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo o cartafol %s"
 
-#: ../mail/em-folder-tree.c:895
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando cartafol %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1954
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:904 ../mail/message-list.c:1956
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:919
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Non se pode(n) soltar a(s) mensaxe(s) no almacenamento do nivel superior"
 
-#: ../mail/em-folder-tree.c:996 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Copiar ao cartafol"
 
-#: ../mail/em-folder-tree.c:997 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Mover ao cartafol"
 
-#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: ../mail/em-folder-tree.c:2079 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Ver"
-
-#: ../mail/em-folder-tree.c:2080
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Abrir nunha _nova ventá"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2085
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "_Novo cartafol..."
 
-#: ../mail/em-folder-tree.c:2088
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ../mail/em-folder-tree.c:2095 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ../mail/em-folder-tree.c:2096
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "Ac_tualizar"
 
-#: ../mail/em-folder-tree.c:2097
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "Lim_par a caixa de saída"
 
-#: ../mail/em-folder-tree.c:2103 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Baleirar o lixo"
 
@@ -11867,7 +12258,7 @@ msgstr "Copiando `%s' a `%s'"
 
 #: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
 #: ../mail/em-folder-view.c:1208
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
@@ -11905,7 +12296,7 @@ msgstr "Vostede non ten os permisos suficientes para eliminar este correo."
 msgid "_Reply to Sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:579 ../mail/em-popup.c:590
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Reenviar"
@@ -11961,7 +12352,7 @@ msgstr "_Etiqueta"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:500
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Ningún"
 
@@ -12016,76 +12407,81 @@ msgid "Filter based on _Mailing List"
 msgstr "Filtrar por lista de _correo"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2268 ../mail/em-folder-view.c:2312
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
+#: ../plugins/google-account-setup/google-source.c:301
+#: ../plugins/google-account-setup/google-source.c:586
+#: ../plugins/google-account-setup/google-source.c:772
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../mail/em-folder-view.c:2530
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "Non se puido obter a mensaxe"
 
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "Obtendo a mensaxe..."
 
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "Ch_amar a..."
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
 msgstr "Crear cartafol de _busca"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "_Desde este enderezo"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "_A este enderezo"
 
-#: ../mail/em-folder-view.c:3310
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "Prema para enviar un correo a %s"
 
-#: ../mail/em-folder-view.c:3322
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "Clic para chamar %s"
 
-#: ../mail/em-folder-view.c:3327
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "Prema para ocultar ou mostrar os enderezos"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:494
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "Equivalencias: %d"
 
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "_Buscar:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:662
+#: ../mail/em-format-html-display.c:638
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../mail/em-format-html-display.c:667
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "_Seguinte"
 
-#: ../mail/em-format-html-display.c:672
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "_Diferenciar maiúsculas e minúsculas"
 
-#: ../mail/em-format-html-display.c:971 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:649
 msgid "Unsigned"
 msgstr "Non asinado"
 
-#: ../mail/em-format-html-display.c:971
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12093,11 +12489,11 @@ msgstr ""
 "Esta mensaxe non está asinada. Non hai garantía de que a mensaxe sexa "
 "auténtica."
 
-#: ../mail/em-format-html-display.c:972 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
 msgid "Valid signature"
 msgstr "Sinatura válida"
 
-#: ../mail/em-format-html-display.c:972
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12105,11 +12501,11 @@ msgstr ""
 "Esta mensaxe está asinada e é válida, o que significa que é moi probable que "
 "a mensaxe sexa auténtica."
 
-#: ../mail/em-format-html-display.c:973 ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
 msgid "Invalid signature"
 msgstr "Sinatura non válida"
 
-#: ../mail/em-format-html-display.c:973
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12117,11 +12513,11 @@ msgstr ""
 "A sinatura desta mensaxe non se pode verificar, puido ser alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:974 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
 msgid "Valid signature, but cannot verify sender"
 msgstr "Sinatura válida, mais non se pode verificar o remitente"
 
-#: ../mail/em-format-html-display.c:974
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12129,11 +12525,11 @@ msgstr ""
 "Esta mensaxe está asinada cunha sinatura válida, mais non se puido verificar "
 "o remitente da mensaxe."
 
-#: ../mail/em-format-html-display.c:975 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
 msgid "Signature exists, but need public key"
 msgstr "A sinatura existe pero se necesita a chave pública"
 
-#: ../mail/em-format-html-display.c:975
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12141,11 +12537,11 @@ msgstr ""
 "Esta mensaxe está asinada cunha sinatura, mais non hai unha chave pública "
 "correspondente."
 
-#: ../mail/em-format-html-display.c:982 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:659
 msgid "Unencrypted"
 msgstr "Non cifrado"
 
-#: ../mail/em-format-html-display.c:982
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12153,11 +12549,11 @@ msgstr ""
 "Esta mensaxe non está cifrada. O seu contido pode verse en tránsito a través "
 "de Internet."
 
-#: ../mail/em-format-html-display.c:983 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
 msgid "Encrypted, weak"
 msgstr "Cifrado, débil"
 
-#: ../mail/em-format-html-display.c:983
+#: ../mail/em-format-html-display.c:959
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12167,11 +12563,11 @@ msgstr ""
 "difícil, mais non imposible para un intruso ver o contido desta mensaxe "
 "dentro dun período de tempo útil."
 
-#: ../mail/em-format-html-display.c:984 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: ../mail/em-format-html-display.c:984
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12179,11 +12575,11 @@ msgstr ""
 "Esta mensaxe está cifrada. Sería difícil para un intruso ver o contido desta "
 "mensaxe."
 
-#: ../mail/em-format-html-display.c:985 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
 msgid "Encrypted, strong"
 msgstr "Cifrado, forte"
 
-#: ../mail/em-format-html-display.c:985
+#: ../mail/em-format-html-display.c:961
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12192,89 +12588,89 @@ msgstr ""
 "Esta mensaxe está cifrada cun algoritmo de cifrado forte. Sería moi difícil "
 "para un intruso ver o contido desta mensaxe dentro dun período de tempo útil."
 
-#: ../mail/em-format-html-display.c:1086 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ver o certificado"
 
-#: ../mail/em-format-html-display.c:1101
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "Este certificado non é visible"
 
-#: ../mail/em-format-html-display.c:1394
+#: ../mail/em-format-html-display.c:1370
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminado o %d de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1402
+#: ../mail/em-format-html-display.c:1378
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: ../mail/em-format-html-display.c:1405
+#: ../mail/em-format-html-display.c:1381
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "antes do %d de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1483
+#: ../mail/em-format-html-display.c:1459
 msgid "_View Inline"
 msgstr "_Ver en liña"
 
-#: ../mail/em-format-html-display.c:1484
+#: ../mail/em-format-html-display.c:1460
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../mail/em-format-html-display.c:1485
+#: ../mail/em-format-html-display.c:1461
 msgid "_Fit to Width"
 msgstr "_Axustar á largura"
 
-#: ../mail/em-format-html-display.c:1486
+#: ../mail/em-format-html-display.c:1462
 msgid "Show _Original Size"
 msgstr "Mostrar tamaño _orixinal"
 
-#: ../mail/em-format-html-display.c:2006
+#: ../mail/em-format-html-display.c:1982
 msgid "Save attachment as"
 msgstr "Gardar anexo como"
 
-#: ../mail/em-format-html-display.c:2010
+#: ../mail/em-format-html-display.c:1986
 msgid "Select folder to save all attachments"
 msgstr "Seleccione o cartafol onde gardar todos os anexos"
 
-#: ../mail/em-format-html-display.c:2061
+#: ../mail/em-format-html-display.c:2037
 msgid "_Save Selected..."
 msgstr "_Gardar os seleccionados..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2128
+#: ../mail/em-format-html-display.c:2104
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d an_exo"
 msgstr[1] "%d an_exos"
 
-#: ../mail/em-format-html-display.c:2135 ../mail/em-format-html-display.c:2224
+#: ../mail/em-format-html-display.c:2111 ../mail/em-format-html-display.c:2200
 msgid "S_ave"
 msgstr "G_ardar"
 
-#: ../mail/em-format-html-display.c:2146
+#: ../mail/em-format-html-display.c:2122
 msgid "S_ave All"
 msgstr "G_ardar todo"
 
-#: ../mail/em-format-html-display.c:2220
+#: ../mail/em-format-html-display.c:2196
 msgid "No Attachment"
 msgstr "Sen anexo"
 
-#: ../mail/em-format-html-display.c:2361 ../mail/em-format-html-display.c:2399
+#: ../mail/em-format-html-display.c:2337 ../mail/em-format-html-display.c:2375
 msgid "View _Unformatted"
 msgstr "Ver sen _formato"
 
-#: ../mail/em-format-html-display.c:2363
+#: ../mail/em-format-html-display.c:2339
 msgid "Hide _Unformatted"
 msgstr "Ocultar sen _formato"
 
-#: ../mail/em-format-html-display.c:2418
+#: ../mail/em-format-html-display.c:2394
 msgid "O_pen With"
 msgstr "A_brir con"
 
-#: ../mail/em-format-html-display.c:2489
+#: ../mail/em-format-html-display.c:2465
 msgid ""
-"Evolution cannot render this email as it is too large to handle. You can "
+"Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
 "O Evolution non pode renderizar este correo porque é demasiado longo para "
@@ -12285,106 +12681,106 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Páxina %d de %d"
 
-#: ../mail/em-format-html.c:501 ../mail/em-format-html.c:510
+#: ../mail/em-format-html.c:503 ../mail/em-format-html.c:512
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Recuperando `%s'"
 
-#: ../mail/em-format-html.c:922
+#: ../mail/em-format-html.c:924
 msgid "Unknown external-body part."
 msgstr "Parte do corpo-externo descoñecida."
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:932
 msgid "Malformed external-body part."
 msgstr "Parte do corpo-externo malformada."
 
-#: ../mail/em-format-html.c:960
+#: ../mail/em-format-html.c:962
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro ao sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:971
+#: ../mail/em-format-html.c:973
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Punteiro ao ficheiro local (%s) válido no sitio \"%s\""
 
-#: ../mail/em-format-html.c:973
+#: ../mail/em-format-html.c:975
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro ao ficheiro local (%s)"
 
-#: ../mail/em-format-html.c:994
+#: ../mail/em-format-html.c:996
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro aos datos remotos (%s)"
 
-#: ../mail/em-format-html.c:1005
+#: ../mail/em-format-html.c:1007
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro aos datos externos descoñecidos (tipo \"%s\")"
 
-#: ../mail/em-format-html.c:1233
+#: ../mail/em-format-html.c:1235
 msgid "Formatting message"
 msgstr "Formatando a mensaxe"
 
-#: ../mail/em-format-html.c:1407
+#: ../mail/em-format-html.c:1409
 msgid "Formatting Message..."
 msgstr "Formatando a mensaxe..."
 
-#: ../mail/em-format-html.c:1559 ../mail/em-format-html.c:1623
-#: ../mail/em-format-html.c:1645 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1562 ../mail/em-format-html.c:1626
+#: ../mail/em-format-html.c:1648 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1560 ../mail/em-format-html.c:1629
-#: ../mail/em-format-html.c:1648 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1632
+#: ../mail/em-format-html.c:1651 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Cco"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1740 ../mail/em-format-quote.c:350
-#: ../mail/em-mailer-prefs.c:1465
+#: ../mail/em-format-html.c:1743 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Aplicación de correo"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1767
+#: ../mail/em-format-html.c:1770
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1772
+#: ../mail/em-format-html.c:1775
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1906
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Esta mensaxe foi enviada por <b>%s</b> no nome de <b>%s</b>"
 
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:314
 msgid "From"
 msgstr "De"
 
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
+#: ../widgets/misc/e-dateedit.c:353
 msgid "Date"
 msgstr "Data"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:97
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
@@ -12393,167 +12789,184 @@ msgstr "Grupos de noticias"
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: ../mail/em-format.c:1197
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Non se puido analizar a mensaxe S/MIME: erro descoñecido"
 
-#: ../mail/em-format.c:1334 ../mail/em-format.c:1490
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido analizar a mensaxe MIME. Mostrando como orixe."
 
-#: ../mail/em-format.c:1342
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de cifrado non soportado para multipart/encrypted"
 
-#: ../mail/em-format.c:1352
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "Non se puido analizar a mensaxe PGP/MIME"
 
-#: ../mail/em-format.c:1352
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Non se puido analizar a mensaxe PGP/MIME: Erro descoñecido"
 
-#: ../mail/em-format.c:1509
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "Formato de sinatura non soportado"
 
-#: ../mail/em-format.c:1517 ../mail/em-format.c:1588
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "Erro ao verificar a sinatura"
 
-#: ../mail/em-format.c:1517 ../mail/em-format.c:1579 ../mail/em-format.c:1588
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "Erro descoñecido ao verificar a sinatura"
 
-#: ../mail/em-format.c:1660
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "Non se puido analizar a mensaxe PGP"
 
-#: ../mail/em-format.c:1660
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Non se puido analizar a mensaxe PGP: Erro descoñecido"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "Cada vez"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "Unha vez ao día"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "Unha vez á semana"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "Unha vez ao mes"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "Engadir cabeceira de correo non desexado personalizada"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "Nome da cabeceira:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "O valor da cabeceira contén:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "O valor contén"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "Cor"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "Etiqueta"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1093 ../mail/em-mailer-prefs.c:1147
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "O plugin %s está dispoñible e o binario está instalado."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1101 ../mail/em-mailer-prefs.c:1156
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "O plugin %s non está dispoñible. Verifique se o paquete está instalado."
 
-#: ../mail/em-mailer-prefs.c:1122
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "Non hai dispoñible un plugin de correo non desexado"
 
 #. green
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Tarefas pendentes"
 
 #. blue
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Máis tarde"
 
-#: ../mail/em-migrate.c:1210
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"A localización e a xerarquía dos cartafoles da caixa de correo modificouse "
-"desde o Evolution 1.x.\n"
-"\n"
-"Agarde mentres o Evolution migra os seus cartafoles..."
+#: ../mail/em-migrate.c:1247
+#, c-format
+msgid "Migrating '%s':"
+msgstr "Migrando '%s':"
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Non é posible crear un cartafol novo: `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Non é posible copiar o cartafol `%s' en `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Non é posible examinar as caixas de correo existentes en `%s': %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:1868
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"A localización e a xerarquía dos cartafoles da caixa de correo modificouse "
+"desde o Evolution 1.x.\n"
+"\n"
+"Agarde mentres o Evolution migra os seus cartafoles..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Non foi posible abrir os datos antigos POP keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Non é posible crear o directorio de datos POP3 keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Non é posible copiar os datos POP3 keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Fallo ao crear o almacenamento de correo local `%s': %s"
 
-#: ../mail/em-migrate.c:2851
+#: ../mail/em-migrate.c:2898
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"O formato de resumo dos cartafoles de correo de Evolution cambiouse a "
+"sqlitedesde o Evolution 2.24.\n"
+"\n"
+"Agarde mentres o Evolution migra os seus cartafoles..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Non é posible crear os cartafoles de correo local en `%s': %s"
 
-#: ../mail/em-migrate.c:2870
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12561,43 +12974,44 @@ msgstr ""
 "Non é posible ler a configuración da instalación anterior do Evolution, "
 "`evolution/config.xmldb' non existe ou está danado."
 
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 msgid "_Reply to sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Responder á _lista"
 
 #. make it first item
-#: ../mail/em-popup.c:640 ../mail/em-popup.c:869
+#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
 msgid "_Add to Address Book"
 msgstr "_Engadir á axenda de enderezos"
 
-#: ../mail/em-subscribe-editor.c:596
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Este almacenamento non soporta subscricións ou non están activadas."
 
-#: ../mail/em-subscribe-editor.c:629
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Subscrito"
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Cartafol"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: ../mail/em-subscribe-editor.c:856
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "Non se seleccionou ningún servidor"
 
+#. Check buttons
 #: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:124
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "_Non mostrar esta mensaxe outra vez."
 
@@ -12700,84 +13114,91 @@ msgstr ""
 "address_count."
 
 #: ../mail/evolution-mail.schemas.in.h:17
-#, fuzzy
-msgid "Custom headers to use while checking for junk."
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
 msgstr ""
-"Determina se se deben usar cabeceiras personalizadas para comprobar correo "
-"non desexado"
+"Controla como de frecuente os cambios locais son sincronizados co servidor "
+"de correo remoto. O intervalo deber ser alomenos 30 segundos."
 
 #: ../mail/evolution-mail.schemas.in.h:18
+msgid "Custom headers to use while checking for junk."
+msgstr "Cabeceiras personalizadas para comprobar o correo non desexado."
+
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr ""
+"Cabeceiras personalizadas para comprobar o correo non desexado. Os elementos "
+"da lista son cadeas co formato \"nomedacabeceira=valor\"."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Conxunto de caracteres predeterminado para escribir mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Conxunto de caracteres predeterminado para escribir mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Conxunto de caracteres predeterminado para mostrar mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Conxunto de caracteres predeterminado para mostrar mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Estilo de reenvío predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Altura predeterminada da ventá do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Altura predeterminada da ventá da mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Altura predeterminada do diálogo de subscrición."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Estilo de resposta predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Valor predeterminado para o estado expandido do fío"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Largura predeterminada da ventá do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Largura predeterminada da ventá da mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Largura predeterminada do diálogo de subscrición."
 
-#: ../mail/evolution-mail.schemas.in.h:32
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
 "Determines whether to look up addresses for junk filtering in local "
 "addressbook only"
 msgstr ""
-"Determina se se debe buscar o enderezo do remitente no libro de enderezos"
+"Determina se se deben buscar os enderezos para o correo non desexado "
+"filtrando soamente no libro de enderezos local"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr ""
 "Determina se se debe buscar o enderezo do remitente no libro de enderezos"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12789,13 +13210,13 @@ msgstr ""
 "libros marcados para autocompletado. Pode ser lento se se marcaron para "
 "autocompletado libros de enderezos remotos (coma LDAP)."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Determina se se deben usar cabeceiras personalizadas para comprobar correo "
 "non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12805,7 +13226,7 @@ msgstr ""
 "non desexado. Se esta opción está activada e se mencionan as cabeceiras, "
 "mellorarase a velocidade de comprobación de correo non desexado."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -12813,62 +13234,64 @@ msgstr ""
 "Determina se se debe usar o mesmo tipo de letra para as liñas \"De\" e "
 "\"Asunto\" na columna \"Mensaxes\" da vista vertical."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directorio onde cargar/anexar os ficheiros no editor."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Directorio onde gardar os ficheiros enviados por correo."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
 msgstr ""
+"Habilitar ou deshabilitar a elipse dos nomes dos cartafoles na árbore de "
+"cartafoles"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Debuxar os indicadores de erros de ortografía nas palabras mentres se "
 "escribe."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Baleirar os cartafoles do correo non desexado ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Baleirar os cartafoles do lixo ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr ""
 "Baleirar todos os cartafoles de correo non desexado ao saír do Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Baleirar todos os cartafoles do lixo ao saír do Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Activar modo cursor, para que poida ver un cursor cando lea un correo."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Activar ou desactivar a barra espaciadora máxica"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Activar ou desactivar a característica de busca ao teclear"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Activar cartafoles de busca"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Activar cartafoles de busca ao inicio."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12880,7 +13303,7 @@ msgstr ""
 "facilmente un cartafol nesa barra lateral tan só tecleando o nome do "
 "cartafol e a selección salta automaticamente a ese cartafol."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12888,28 +13311,28 @@ msgstr ""
 "Activar isto para usar a barra espaciadora para desprazarse na vista previa "
 "da mensaxe, lista de mensaxes e cartafoles."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr ""
 "Activar para renderizar a parte da mensaxe de texto de tamaño limitado."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar o modo cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Altura do panel da lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Altura do panel da lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta a vista previa por cartafol e elimina a selección"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12917,7 +13340,7 @@ msgstr ""
 "Se o usuario tenta abrir 10 ou máis mensaxes ao mesmo tempo, preguntar ao "
 "usuario se está seguro de que quere facelo."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12925,7 +13348,7 @@ msgstr ""
 "Se o panel de \"Previsualización\" está activado, móstrao de lado a lado en "
 "vez de verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12936,13 +13359,15 @@ msgstr ""
 "visualizador de compoñentes Bonobo na base de datos do Gnome pode empregarse "
 "para mostrar o contido."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
+"Altura inicial da ventá \"Enviar e recibir correo\". O valor actualízase "
+"cada vez que o usuario cambia o tamaño en vertical da ventá."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -12950,18 +13375,25 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
+"Valor inicial do estado maximizado da ventá \"Enviar e recibir correo\". O "
+"valor actualízase cando o usuario maximiza ou restaura a ventá. Este valor "
+"particular non é utilizado por Evolution xa que a ventá \"Enviar e recibir "
+"correo\" non pode ser maximizada. Este característica só existe como detalle "
+"da implementación."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
+"Largura inicial da ventá \"Enviar e recibir correo\". O valor actualízase "
+"cada vez que o usuario cambia a tamaño en horizontal da ventá."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "Desactiva ou activa a pregunta cando se marcan varias mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -12969,7 +13401,7 @@ msgstr ""
 "Activa/desactiva a característica onde se repite a pregunta de requírese "
 "sincronización antes de pasar ao modo traballar desconectado."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -12979,31 +13411,31 @@ msgstr ""
 "dun cartafol de busca borra permanentemente a mensaxe, non só os elimina dos "
 "resultados de busca."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "Última vez que se baleirou o correo non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "Última vez que se baleirou o lixo"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Nivel máis alá do cal a mensaxe débese rexistrar."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas e as súas cores asociadas"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Lista de licenzas aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13012,15 +13444,15 @@ msgstr ""
 "contén cadeas que nomean subdirectorios relativos a /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceiras personalizadas e se están activadas."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
-msgstr ""
+msgstr "Lista de códigos de idioma de diccionarios usados para a corrección."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13029,135 +13461,133 @@ msgstr ""
 "lista contén cadeas que conteñen o nome: cor onde cor usa a codificación "
 "hexadecimal HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Lista de tipos mime de verificación de visualizadores de compoñentes Bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nomes de protocolos coa se aceptou a licenza."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Cargar imaxes para mensaxes HTML sobre http"
 
-#: ../mail/evolution-mail.schemas.in.h:80
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net. 1 - Load images in messages from contacts. 2 - "
-"Always load images off the net."
+"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
 msgstr ""
 "Cargar imaxes de mensaxes HTML sobre http(s). Os valores posibles son: 0 - "
 "nunca cargar as imaxes desde a rede, 1 - cargar as imaxes se o remitente "
-"está na axenda de enderezos, 2 - cargar sempre as imaxes desde a rede"
+"está na axenda de enderezos, 2 - cargar sempre as imaxes desde a rede."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Rexistrar accións de filtraxe"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Rexistrar accións de filtraxe no ficheiro de rexistro especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Ficheiro de rexistro para rexistrar as accións de filtraxe"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Ficheiro de rexistro para rexistrar as accións de filtraxe."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto despois do tempo de espera especificado"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto despois do tempo de espera especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar as citas textuais na \"Previsualización\" da mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar as citas textuais na \"Previsualización\" da mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Altura predeterminada da ventá de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Largura predeterminada da ventá de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de visualización de mensaxe (\"normal\", \"cabeceiras completas\", "
 "\"orixe\")"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Número mínimo de días antes do baleirado do correo non desexado ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Número mínimo de días antes do baleirado do lixo ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Tempo mínimo antes do baleirado do correo non desexado ao saír, en días."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tempo mínimo antes do baleirado do lixo ao saír, en días."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Número de enderezos para mostrar en A/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Preguntar cando o asunto está baleiro"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar ao usuario cando tente expurgar un cartafol."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar ao usuario cando tente enviar unha mensaxe sen un asunto."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr ""
 "Preguntar para verificar se o usuario quere desconectarse inmediatamente"
 
-#: ../mail/evolution-mail.schemas.in.h:101
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
-msgstr "_Preguntar cando se envíen mensaxes cun asunto baleiro"
+msgstr "Preguntar cando se eliminan mensaxes nun cartafol de busca"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Preguntar cando o usuario expurga"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cando o usuario só encha o campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Preguntar cando o usuario tente abrir dez ou máis mensaxes ao mesmo tempo"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13165,146 +13595,145 @@ msgstr ""
 "Preguntar ao enviar mensaxes en HTML aos destinatarios que non desexen "
 "recibilas."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Preguntar cando o usuario tente enviar unha mensaxe sen destinatarios Para "
 "ou CC."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cando o usuario tente enviar un HTML non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Preguntar cando se marcan varias mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:109
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Recoñecer emoticonas no texto e substituílas con imaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Recoñecer ligazóns no texto e substituílas."
 
-#: ../mail/evolution-mail.schemas.in.h:111
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
-msgstr "Executar a proba de correo non desexado no correo entrante"
+msgstr "Executar a proba de correo non desexado no correo entrante."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Directorio onde gardar"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Search for the sender photo in local addressbooks"
 msgstr "Buscar a foto do remitente nas axendas locais de enderezos"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML por defecto"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Enviar correo en HTML por defecto."
 
-#: ../mail/evolution-mail.schemas.in.h:116
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
-msgstr ""
-"Mostrar o correo do remitente na columna de mensaxes na lista de mensaxes"
+msgstr "Mostrar o correo do remitente na columna da lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "Intervalo de sincronización do servidor"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Mostrar animacións"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Mostrar as imaxes animadas como animacións."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Mostrar as mensaxes eliminadas (riscadas) na lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar as mensaxes eliminadas na lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Mostrar a foto do remitente"
 
-#: ../mail/evolution-mail.schemas.in.h:124
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
-"Mostrar o correo do remitente na columna de composición de mensaxes na lista "
-"de mensaxes"
+"Mostrar o correo do remitente nunha columna separada na lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostrar a foto do remitente no panel de lectura da mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Verificación ortográfica en liña"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Spell checking color"
 msgstr "Cor da verificación de ortografía"
 
-#: ../mail/evolution-mail.schemas.in.h:128
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell checking languages"
-msgstr "Verificación ortográfica en liña"
+msgstr "Idiomas da verificación ortográfica"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Altura predeterminada do diálogo de subscrición"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Largura predeterminada do diálogo de subscrición"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Tipo de letra do terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Límite da parte de texto da mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "O plugin predefinido para a asociación de correo non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr ""
 "A última vez que se baleirou o correo non desexado, en días desde a época."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "A última vez que se baleirou o lixo, en días desde a época."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "O tipo de letra do terminal para mostrar o correo."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "O tipo de letra de largura variable para mostrar o correo."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
+"Isto pode ter tres posibles valores. \"0\" para erros. \"1\" para avisos. \"2"
+"\" para mensaxes de depuración."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -13312,8 +13741,7 @@ msgstr ""
 "Isto decide o tamaño máximo da parte de texto que se pode formatar no "
 "Evolution. O predeterminado é 4MB / 4096 e está especificado en KB."
 
-#: ../mail/evolution-mail.schemas.in.h:140
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13323,13 +13751,16 @@ msgstr ""
 "varios plugins activados. Se o plugin predeterminado listado está "
 "desactivado, entón non se usarán os outros plugins dispoñibles."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid ""
-"This key is read only once and reset to false after read. This unselects the "
-"mail in the list and removes the preview for that folder."
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
 msgstr ""
+"Esta chave é dunha soa lectura e despois de lida establécese a \"false\". "
+"Isto deselecciona o correo na lista e elimina a vista previa para esa "
+"carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13341,18 +13772,21 @@ msgstr ""
 "estrutura XML é &lt;header enabled&gt; - defínao como activado se se debe "
 "mostrar a cabeceira na visualización do correo."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local addressbook only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
+"Esta opción está relacionada coa chave lookup_addressbook e úsase para "
+"determinar se se debe buscar na axenda de enderezos locais só para excluír "
+"dos filtros de correo non desexado o correo enviado por contactos coñecidos."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "Esta opción podería axudar a mellorar a velocidade de recepción."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13360,53 +13794,41 @@ msgstr ""
 "Isto define o número de enderezos que se mostra na visualización da lista de "
 "mensaxes predeterminada, para os restantes móstrase un '...'."
 
-#: ../mail/evolution-mail.schemas.in.h:146
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr ""
 "Esta opción especifica se os fíos deberían estar por defecto no estado "
-"expandido ou contraído. É necesario reiniciar o Evolution"
+"expandido ou contraído. É necesario reiniciar o Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:147
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 msgstr ""
-"Esta opción especifica se os fíos deberían estar por defecto no estado "
-"expandido ou contraído. É necesario reiniciar o Evolution"
+"Esta opción especifica se os fíos deberían estar ordenados pola última "
+"mensaxe en cada fío, en lugar de pola data das mensaxes. É necesario "
+"reiniciar o Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Lista de mensaxes por fíos."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Lista de mensaxes por fíos"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Lista de mensaxes por fíos baseadas no asunto"
 
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "Time interval, in seconds, how often upload store changes to server."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid ""
-"Time interval, in seconds, how often upload store changes to server. The "
-"actual value cannot be less than 30 seconds."
-msgstr ""
-
 #: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Tempo de espera para marcar unha mensaxe como vista"
 
 #: ../mail/evolution-mail.schemas.in.h:154
-#, fuzzy
 msgid "Timeout for marking message as seen."
 msgstr "Tempo de espera para marcar unha mensaxe como vista."
 
@@ -13417,6 +13839,7 @@ msgstr "Cadea UID para a conta predeterminada."
 #: ../mail/evolution-mail.schemas.in.h:156
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
+"Color de subliñado para as palabras mal escritas cando se usa o corrector."
 
 #: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
@@ -13493,10 +13916,14 @@ msgstr "O elemento do menú Ver/Responder está seleccionado."
 #: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
+"Se se debe engadir un requirimento de confirmación de lectura por defecto a "
+"cada mensaxe."
 
 #: ../mail/evolution-mail.schemas.in.h:176
 msgid "Whether disable ellipsizing feature of folder names in folder tree."
 msgstr ""
+"Se se debe deshabilitar a característica de elipse no nome dos cartafoles na "
+"árbore de cartafoles."
 
 #: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
@@ -13508,7 +13935,7 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
-msgstr ""
+msgstr "Se se deben ordear os fíos dos correos pola última mensaxe en cada fío"
 
 #: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
@@ -13518,31 +13945,31 @@ msgstr "Largura do panel de lista de mensaxes"
 msgid "Width of the message-list pane."
 msgstr "Largura do panel de lista de mensaxes."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Importando datos Elm"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Importador do Elm do Evolution"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Importar correo desde o Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "Cartafol de destino:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "Seleccionar cartafol para o que importar"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Caixa de correo Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de cartafoles no formato caixa de correo de Berkeley"
 
@@ -13550,7 +13977,7 @@ msgstr "Importador de cartafoles no formato caixa de correo de Berkeley"
 msgid "Importing mailbox"
 msgstr "Importando caixa de correo"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando `%s'"
@@ -13560,15 +13987,15 @@ msgstr "Importando `%s'"
 msgid "Scanning %s"
 msgstr "Examinando %s"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "Importando datos do Pine"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Importador do Pine do Evolution"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Importar correo do Pine."
 
@@ -13596,142 +14023,150 @@ msgstr "lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "Engadir regra de filtraxe"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Modelos"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionado, "
 msgstr[1] "%d seleccionado, "
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d eliminado"
 msgstr[1] "%d eliminado"
 
-#: ../mail/mail-component.c:558
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d correo non desexado"
 msgstr[1] "%d correo non desexado"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviado"
 
-#: ../mail/mail-component.c:565
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d non enviado"
 msgstr[1] "%d non enviado"
 
-#: ../mail/mail-component.c:571
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d sen ler, "
 msgstr[1] "%d sen ler, "
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:916
 msgid "New Mail Message"
 msgstr "Nova mensaxe de correo"
 
-#: ../mail/mail-component.c:914
+#: ../mail/mail-component.c:917
+msgctxt "New"
 msgid "_Mail Message"
-msgstr "Enviar _mensaxe"
+msgstr "_Mensaxe de correo"
 
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:918
 msgid "Compose a new mail message"
 msgstr "Compor unha mensaxe de correo nova"
 
-#: ../mail/mail-component.c:921
+#: ../mail/mail-component.c:924
 msgid "New Mail Folder"
 msgstr "Novo cartafol de correo"
 
-#: ../mail/mail-component.c:922
+#: ../mail/mail-component.c:925
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Cartafol de correo"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:926
 msgid "Create a new mail folder"
 msgstr "Crear un cartafol de correo novo"
 
-#: ../mail/mail-component.c:1070
+#: ../mail/mail-component.c:1073
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Fallou ao actualizar a configuración do correo ou os cartafoles."
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1586
 msgid "Error"
 msgstr "Erro"
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1586
 msgid "Errors"
 msgstr "Erros"
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1587
 msgid "Warnings and Errors"
 msgstr "Avisos e erros"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1588
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1588
 msgid "Error, Warnings and Debug messages"
 msgstr "Erro, avisos e mensaxes de depuración"
 
-#: ../mail/mail-component.c:1712
+#: ../mail/mail-component.c:1715
 msgid "Debug Logs"
 msgstr "Rexistros de depuración"
 
-#: ../mail/mail-component.c:1726
+#: ../mail/mail-component.c:1729
 msgid "Show _errors in the status bar for"
 msgstr "Mostrar _erros na barra de estado"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1742
+#: ../mail/mail-component.c:1745
 msgid "second(s)."
 msgstr "segundo(s)."
 
-#: ../mail/mail-component.c:1748
+#: ../mail/mail-component.c:1751
 msgid "Log Messages:"
 msgstr "Mensaxes de rexistro:"
 
-#: ../mail/mail-component.c:1789
+#: ../mail/mail-component.c:1792
 msgid "Log Level"
 msgstr "Nivel de rexistro"
 
-#: ../mail/mail-component.c:1798 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Hora"
 
-#: ../mail/mail-component.c:1808 ../mail/message-list.c:2386
+#: ../mail/mail-component.c:1811 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensaxes"
 
-#: ../mail/mail-component.c:1817 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Pechar esta ventá"
@@ -13758,7 +14193,7 @@ msgstr "<b>Si_naturas</b>"
 
 #: ../mail/mail-config.glade.h:7
 msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr ""
+msgstr "<b>Opción publicar por enriba</b> (Non se recomenda)"
 
 #: ../mail/mail-config.glade.h:8
 msgid "<b>_Languages</b>"
@@ -13890,19 +14325,16 @@ msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Sempre _confiar nas chaves do meu anel de chaves ao cifrar"
 
 #: ../mail/mail-config.glade.h:43
-#, fuzzy
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Cifrarme sempre a _min mesmo ao enviar correo cifrado"
 
 #: ../mail/mail-config.glade.h:44
-#, fuzzy
 msgid "Always request rea_d receipt"
-msgstr "_Requirir confirmación de lectura"
+msgstr "_Requirir sempre confirmación de lectura"
 
 #: ../mail/mail-config.glade.h:46
-#, fuzzy
 msgid "Automatically insert _emoticon images"
-msgstr "_Inserir emoticonas automaticamente"
+msgstr "Inserir as imaxes das _emoticonas automaticamente"
 
 #: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
@@ -13921,12 +14353,11 @@ msgid "Ch_eck for Supported Types "
 msgstr "_Verificar tipos soportados "
 
 #: ../mail/mail-config.glade.h:51
-#, fuzzy
 msgid "Check cu_stom headers for junk"
-msgstr "Verificar se o correo entrante é _correo non desexado"
+msgstr ""
+"Verificar as cabeceiras personalizadas en busca de _correo non desexado"
 
 #: ../mail/mail-config.glade.h:52
-#, fuzzy
 msgid "Check incoming _messages for junk"
 msgstr "Verificar se o correo entrante é _correo non desexado"
 
@@ -13979,29 +14410,26 @@ msgid "Default character e_ncoding:"
 msgstr "_Codificación de caracteres predeterminada: "
 
 #: ../mail/mail-config.glade.h:68
-#, fuzzy
 msgid "Delete junk messages on e_xit"
 msgstr "Eliminar os correos non desexados ao saí_r"
 
 #: ../mail/mail-config.glade.h:70
-#, fuzzy
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Asinar _dixitalmente as mensaxes saíntes (por defecto)"
 
 #: ../mail/mail-config.glade.h:71
-#, fuzzy
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr ""
-"Non formatar os contidos do texto dos correos se o ta_maño do texto excede"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "Non formatar os correos se o ta_maño do texto excede"
 
 #: ../mail/mail-config.glade.h:72
 msgid "Do not mar_k messages as junk if sender is in my addressbook"
 msgstr ""
+"Non mar_car os correos como non desexados se o remitente está na miña axenda "
+"de enderezos"
 
 #: ../mail/mail-config.glade.h:73
-#, fuzzy
 msgid "Do not quote"
-msgstr "Non eliminar"
+msgstr "Non citar"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -14025,7 +14453,7 @@ msgstr "Baleirar os cartafoles de lixo ao _saír"
 
 #: ../mail/mail-config.glade.h:79
 msgid "Enable Magic S_pacebar "
-msgstr ""
+msgstr "Habilitar a barra espaciadora _máxica"
 
 #: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
@@ -14064,9 +14492,8 @@ msgid "HTML Messages"
 msgstr "Mensaxes HTML"
 
 #: ../mail/mail-config.glade.h:91
-#, fuzzy
 msgid "H_TTP Proxy:"
-msgstr "_Apdo. de correos:"
+msgstr "H_TTP Proxy:"
 
 #: ../mail/mail-config.glade.h:92
 msgid "Headers"
@@ -14114,12 +14541,14 @@ msgstr "Editor de mensaxes"
 
 #: ../mail/mail-config.glade.h:106
 msgid "No _Proxy for:"
-msgstr ""
+msgstr "Sen _proxy para:"
 
 #: ../mail/mail-config.glade.h:107
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
+"Nota: O guión baixo o nome da nota úsase como un identificador mnemónico no "
+"menú."
 
 #: ../mail/mail-config.glade.h:108
 msgid ""
@@ -14129,18 +14558,24 @@ msgstr ""
 "Nota: non se lle pedirá un contrasinal até que se conecte por primeira vez"
 
 #: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+"Esta opción será ignorada se se atopa unha coincidencia cunha cabeceira "
+"personalizada de correo non desexado."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "Or_ganización:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da _Chave PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "_Contrasinal:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -14148,7 +14583,7 @@ msgstr ""
 "Introduza un nome descritivo para esta conta no espazo de abaixo.\n"
 "Este nome usarase só para a visualización."
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14157,7 +14592,7 @@ msgstr ""
 "seguro, pregunte ao seu administrador do sistema ou provedor de acceso a "
 "Internet."
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14167,111 +14602,115 @@ msgstr ""
 "abaixo non necesitan encherse, a non ser que desexe incluír esta información "
 "no correo que envíe."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Escolla entre as seguintes opcións"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
 msgstr "Porto:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Avisar cando se envíen mensaxes só con destinatarios _Cco definidos"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Citada"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "_Lembrar contrasinal"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Lembrar _contrasinal"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
-msgstr ""
+msgstr "Equipo S_OCKS:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "B_uscar fotografías do remitente só nas axendas de enderezos locais"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "S_eleccione..."
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "En_viar confirmacións de mensaxes:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "Tipo de letra e_stándar:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Seleccione tipo de letra de largura fixa para HTML"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Seleccione tipo de letra de largura fixa en HTML para imprimir"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Seleccione tipo de letra de largura variable en HTML"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Seleccione tipo de letra de largura variable en HTML para imprimir"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Enviando correo"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Cartafol de _mensaxes enviadas:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "O ser_vidor require autenticación"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_Tipo de servidor: "
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Certificado de _sinatura:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "Sinat_ura:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Táboa de sinaturas"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Verificación da ortografía"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr "Comezar a _escribir pola parte de abaixo ao responder"
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "_Tipo: "
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14279,7 +14718,7 @@ msgstr ""
 "Esta lista de idiomas reflicte unicamente os idiomas para os cales hai "
 "instalado un dicionario."
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14289,12 +14728,7 @@ msgstr ""
 "sinatura. O nome que especifique usarase\n"
 "só para a visualización. "
 
-#: ../mail/mail-config.glade.h:150
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14302,24 +14736,25 @@ msgstr ""
 "Teclee o nome polo que quere identificar a esta conta.\n"
 "Por exemplo: \"Traballo\" ou \"Persoal\""
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.glade.h:154
 msgid "Us_ername:"
 msgstr "_Nome de usuario:"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticación"
 
-#: ../mail/mail-config.glade.h:155 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:678
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "_Nome de usuario:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "Largura v_ariable:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14329,128 +14764,125 @@ msgstr ""
 "\n"
 "Prema en \"Adiante\" para comezar. "
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "_Engadir sinatura"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "Cargar _sempre as imaxes desde Internet"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
 msgid "_Automatic proxy configuration URL:"
-msgstr "URL de configuración de proxy _automático:"
+msgstr "_URL para a configuración automática do proxy:"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "Plugin por _defecto de correo non desexado:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
-msgstr ""
+msgstr "Conexión _directa a Internet"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Non a_sinar as peticións de reunión (para compatibilidade con Outlook)"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "_Estilo de reenvío:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
-msgstr ""
+msgstr "_Manter a firma por debaixo da mensaxe orixinal ao respostar"
 
-#: ../mail/mail-config.glade.h:169
-#, fuzzy
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
-msgstr "_Cargar imaxes dos contactos no correo"
+msgstr "_Cargar imaxes no correo dos contactos"
 
-#: ../mail/mail-config.glade.h:170
-#, fuzzy
+#: ../mail/mail-config.glade.h:171
 msgid "_Lookup in local addressbook only"
-msgstr "Listar os cartafoles de axendas de enderezos locais"
+msgstr "_Buscar soamente na axenda de enderezos local"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "_Facer esta a miña conta predeterminada"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "Configuración do proxy _manual:"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Marcar as mensaxes como lidas despois de"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar as imaxes desde Internet"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Camiño:"
 
-#: ../mail/mail-config.glade.h:177
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr "_Preguntar cando se envíen mensaxes HTML a contactos que non as queren"
-
 #: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "_Preguntar cando se envíen correos HTML a contactos que non as queren"
+
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Preguntar cando se envíen mensaxes cun asunto baleiro"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "Estilo da _resposta:"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
-msgstr ""
+msgstr "Proxy HTTP _seguro:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "S_eleccionar..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "_Mostrar animacións de imaxes"
 
-#: ../mail/mail-config.glade.h:186
-#, fuzzy
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr ""
 "Mo_strar a fotografía do remitente na previsualización do correo electrónico"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Reducir as cabeceiras Para / Cc / Cco "
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_Usar unha conexión segura:"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "Usar _predeterminado do sistema"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar os mesmos tipos de letra que noutras aplicacións"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "enderezos"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "descrición"
 
@@ -14490,43 +14922,43 @@ msgstr "_Diferenciar maiúsculas e minúsculas"
 msgid "Co_mpleted"
 msgstr "Co_mpletado"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "_Buscar:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Buscar na mensaxe"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
 msgid "Flag to Follow Up"
 msgstr "Marcar para facer seguimento"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Subscricións de cartafoles"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Acordo de licenza"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Ningún seleccionado"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "S_ervidor:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Información de seguranza"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Cartafoles específicos"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14534,19 +14966,19 @@ msgstr ""
 "As mensaxes que seleccionou para o seguimento lístanse abaixo.\n"
 "Seleccione unha acción de seguimento desde o menú \"Marcar\"."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Aceptar a licenza"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Vence o:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Marca:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "_Marque isto para aceptar o acordo de licenza"
 
@@ -14597,11 +15029,11 @@ msgstr "Enviando a mensaxe %d de %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Fallo ao enviar %d de %d mensaxes"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:711
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:713
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "Terminado."
 
@@ -14629,9 +15061,9 @@ msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
 #: ../mail/mail-ops.c:1270
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieving quota information for folder %s"
-msgstr "Información de contacto de %s"
+msgstr "Obtendo a información de cota para o cartafol %s"
 
 #: ../mail/mail-ops.c:1339
 #, c-format
@@ -14690,7 +15122,7 @@ msgstr[1] "Recuperando %d mensaxes"
 #: ../mail/mail-ops.c:1978
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Gardando %d mensaxe"
 msgstr[1] "Gardando %d mensaxes"
 
@@ -14740,27 +15172,27 @@ msgstr "Preparando a conta '%s' para o modo sen conexión"
 msgid "Checking Service"
 msgstr "Verificando servizo"
 
-#: ../mail/mail-send-recv.c:194
+#: ../mail/mail-send-recv.c:182
 msgid "Canceling..."
 msgstr "Cancelando..."
 
-#: ../mail/mail-send-recv.c:397
+#: ../mail/mail-send-recv.c:385
 msgid "Send & Receive Mail"
 msgstr "Enviar e recibir correo"
 
-#: ../mail/mail-send-recv.c:408
+#: ../mail/mail-send-recv.c:396
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: ../mail/mail-send-recv.c:517
+#: ../mail/mail-send-recv.c:505
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: ../mail/mail-send-recv.c:517 ../mail/mail-send-recv.c:590
+#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "En espera..."
 
-#: ../mail/mail-send-recv.c:817
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando o correo novo"
@@ -14792,11 +15224,6 @@ msgstr "O usuario cancelou a operación."
 msgid "_Save and Close"
 msgstr "_Gardar e Pechar"
 
-#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Ficheiro"
-
 #: ../mail/mail-signature-editor.c:355
 msgid "Edit Signature"
 msgstr "Editar sinatura"
@@ -14845,11 +15272,11 @@ msgstr "Actualizando cartafoles de busca para '%s: %s'"
 msgid "Updating Search Folders for '%s'"
 msgstr "Actualizando cartafoles de busca para '%s'"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Editar cartafol de busca"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Novo cartafol de busca"
 
@@ -14924,13 +15351,12 @@ msgstr ""
 "eliminadas en todos os cartafoles?"
 
 #: ../mail/mail.error.xml.h:14
-#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr ""
-"Está seguro de que quere eliminar permanentemente todas as mensaxes "
-"eliminadas en todos os cartafoles?"
+"Está seguro de que quere borrar permanentemente todas as mensaxes eliminadas "
+"do cartafol \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -15038,9 +15464,8 @@ msgid "Cannot set signature script \"{0}\"."
 msgstr "Non se pode definir o script de sinatura \"{0}\"."
 
 #: ../mail/mail.error.xml.h:41
-#, fuzzy
 msgid "Check Junk Failed"
-msgstr "Verificar se hai _correo non desexado"
+msgstr "Fallou ao verificar se hai _correo non desexado"
 
 #: ../mail/mail.error.xml.h:42
 msgid ""
@@ -15056,23 +15481,20 @@ msgid "Could not save signature file."
 msgstr "Non se puido gardar o ficheiro de sinatura."
 
 #: ../mail/mail.error.xml.h:44
-#, fuzzy
 msgid "Delete \"{0}\"?"
-msgstr "Eliminada: "
+msgstr "Eliminar \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
 msgstr "Eliminar a conta?"
 
 #: ../mail/mail.error.xml.h:46
-#, fuzzy
 msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
+msgstr "Eliminar as mensaxes no cartafol de busca \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:47
-#, fuzzy
 msgid "Delete messages in Search Folder?"
-msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
+msgstr "Eliminar as mensaxes no cartafol de busca?"
 
 #: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
@@ -15223,7 +15645,6 @@ msgstr ""
 "enderezos de correo premendo no botón \"Para:\" ao lado da caixa de entrada."
 
 #: ../mail/mail.error.xml.h:81
-#, fuzzy
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -15231,8 +15652,7 @@ msgid ""
 msgstr ""
 "Asegúrese de que os seguintes destinatarios queren e poden recibir mensaxes "
 "HTML:\n"
-"{0}\n"
-"Enviar de todas as maneiras?"
+"{0}"
 
 #: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
@@ -15267,13 +15687,12 @@ msgstr ""
 "subcartafoles?"
 
 #: ../mail/mail.error.xml.h:90
-#, fuzzy
 msgid "Report Junk Failed"
-msgstr "Importar ficheiro"
+msgstr "Fallou ao informar do correo non desexado"
 
 #: ../mail/mail.error.xml.h:91
 msgid "Report Not Junk Failed"
-msgstr ""
+msgstr "Fallou ao informar do correo que non é SPAM"
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
@@ -15426,6 +15845,9 @@ msgid ""
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
+"Aviso: Eliminar mensaxes dunha carpeta de busca borrará a mensaxeactual "
+"dunha das súas carpetas locais ou remotas.\n"
+"Está seguro que quere facer isto?"
 
 #: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
@@ -15481,86 +15903,89 @@ msgstr "_Expurgar"
 msgid "_Open Messages"
 msgstr "_Abrir mensaxes"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Non vista"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Vista"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1054
+msgid "Forwarded"
+msgstr "Reenviada"
+
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensaxes non vistas"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Múltiples mensaxes"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Inferior"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Superior"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "A máis alta"
 
-#: ../mail/message-list.c:1594 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1601 ../plugins/itip-formatter/itip-view.c:206
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %l:%M %p"
 
-#: ../mail/message-list.c:1610 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %l:%M %p"
 
-#: ../mail/message-list.c:1622 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "O %A ás %k:%M"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: ../mail/message-list.c:3818
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3888 ../mail/message-list.c:4324
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
-#: ../mail/message-list.c:4081
+#: ../mail/message-list.c:4179
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
+"Non hai mensaxes que coincidan cos seus criterios de busca. Probe a limpar a "
+"busca co elemento Limpar do menú Buscar ou cámbiea."
 
-#: ../mail/message-list.c:4083
-#, fuzzy
+#: ../mail/message-list.c:4181
 msgid "There are no messages in this folder."
-msgstr ""
-"\n"
-"\n"
-"Non hai elementos para mostrar nesta visualización."
+msgstr "Non hai mensaxes para amosar neste cartafol."
 
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
@@ -15591,39 +16016,39 @@ msgstr "Mensaxes enviadas"
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Chamar"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "Non reenviar"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "Seguimento"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Para a súa información"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Reenviar"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "Non é necesaria unha resposta"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Revisar"
 
@@ -15664,42 +16089,48 @@ msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
 msgstr ""
+"Lista de pistas para que o plugin de recordatorio de anexos busque no corpo "
+"dunha mensaxe"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
 msgstr ""
+"Lista de pistas para que o plugin de recordatorio de anexos busque no corpo "
+"dunha mensaxe."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:468
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
-msgstr ""
+msgstr "Palabras clave"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-#, fuzzy
 msgid "Attachment Reminder"
-msgstr "Barra de anexos"
+msgstr "Recordatorio de anexos"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
 msgid ""
 "Looks for clues in a message for mention of attachments and warns if the "
 "attachment is missing"
 msgstr ""
+"Busca pistas nunha mensaxe que mencionen a existencia de anexos e avisa se "
+"falta o anexo"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
 msgstr ""
+"Evolution atopou algunhas palabras chave que indican que esta mensaxe "
+"debería conter un anexo, mais non se atopa ningún."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-#, fuzzy
 msgid "Message has no attachments"
-msgstr "Mensaxes con anexos"
+msgstr "A mensaxe non ten anexos"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-#, fuzzy
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "_Editar a mensaxe"
 
@@ -15716,18 +16147,18 @@ msgid "Audio inline plugin"
 msgstr "Plugin de son en liña"
 
 #: ../plugins/backup-restore/backup-restore.c:107
-#, fuzzy
 msgid "Select name of the Evolution backup file"
-msgstr "Seleccione o nome do arquivo do Evolution"
+msgstr "Seleccione o nome do arquivo de copia de seguranza do Evolution"
 
 #: ../plugins/backup-restore/backup-restore.c:136
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar o Evolution despois de facer unha copia de seguranza"
 
 #: ../plugins/backup-restore/backup-restore.c:159
-#, fuzzy
 msgid "Select name of the Evolution backup file to restore"
-msgstr "Seleccione o nome do arquivador do Evolution para restaurar"
+msgstr ""
+"Seleccione o nome do arquivo de copia de seguranza do Evolution para "
+"restaurar"
 
 #: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after restore"
@@ -15738,18 +16169,17 @@ msgid "Restore from backup"
 msgstr "Restaurar desde unha copia de seguranza"
 
 #: ../plugins/backup-restore/backup-restore.c:258
-#, fuzzy
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. \n"
 "It also restores all your personal settings, mail filters etc."
 msgstr ""
-"Pode restaurar o Evolution desde o seu arquivo. Pode restaurar todos os "
-"correos, calendarios, tarefas, notas e axendas de enderezos. \n"
+"Pode restaurar o Evolution desde o seu arquivo de copia de seguranza. Pode "
+"restaurar todos os correos, calendarios, tarefas, notas e axendas de "
+"enderezos. \n"
 "Tamén restaura todas as configuracións persoais, filtros de correo etc."
 
 #: ../plugins/backup-restore/backup-restore.c:264
-#, fuzzy
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurar o Evolution desde o arquivo de copia de seguranza"
 
@@ -15761,88 +16191,111 @@ msgstr "Seleccione o arquivo do Evolution para restaurar:"
 msgid "Choose a file to restore"
 msgstr "Escolla un ficheiro para restaurar"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "Facer unha copia de seguranza do directorio do Evolution"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "Restaurar o directorio do Evolution"
 
-#: ../plugins/backup-restore/backup.c:44
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
-msgstr "Copia de seguranza do Evolution"
+msgstr "Comprobar a copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "Reiniciar o Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
-msgstr ""
+msgstr "Con interface de usuario gráfica"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "Pechando o Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr ""
 "Facendo unha copia de seguranza das contas e configuracións do Evolution"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Facendo unha copia de seguranza dos datos do Evolution (correos, contactos, "
 "calendario, tarefas, notas)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "Terminou a copia de seguranza"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "Reiniciando o Evolution"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "Facendo unha copia dos datos actuais do Evolution"
 
-#: ../plugins/backup-restore/backup.c:119
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
-msgstr "Extraendo ficheiros do arquivo"
+msgstr "Extraendo ficheiros da copia de seguranza"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "Cargando a configuración do Evolution"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "Eliminando os ficheiros temporais da copia de seguranza"
 
-#: ../plugins/backup-restore/backup.c:249
-#, fuzzy, c-format
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr "Asegurando fontes locais"
+
+#: ../plugins/backup-restore/backup.c:435
+#, c-format
 msgid "Backing up to the folder %s"
 msgstr "Facendo a copia de seguranza en %s"
 
-#: ../plugins/backup-restore/backup.c:254
-#, fuzzy, c-format
+#: ../plugins/backup-restore/backup.c:440
+#, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restaurando desde %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "Copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "Restauración do Evolution"
 
+#: ../plugins/backup-restore/backup.c:494
+msgid "Backing up Evolution Data"
+msgstr "Facendo unha copia de seguranza dos datos do Evolution"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Espere mentras Evolution respalda o seus datos."
+
+#: ../plugins/backup-restore/backup.c:497
+msgid "Restoring Evolution Data"
+msgstr "Restaurando os datos do Evolution"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Espere mentras Evolution restaura os seus datos."
+
+#: ../plugins/backup-restore/backup.c:516
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+"Isto pode levar un tempo dependendo da cantidade de datos na súa conta."
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
@@ -15859,11 +16312,11 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "Está seguro de que quere pechar o Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#, fuzzy
 msgid ""
 "Are you sure you want to restore Evolution from the selected backup file?"
 msgstr ""
-"Está seguro de que quere restaurar o Evolution desde o arquivo seleccionado?"
+"Está seguro de que quere restaurar o Evolution desde a copia de seguranza "
+"seleccionada?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid ""
@@ -15878,24 +16331,20 @@ msgstr ""
 "automaticamente despois da copia de seguranza, active o botón de estado."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-#, fuzzy
 msgid "Insufficient Permissions"
-msgstr "Permisos delegados"
+msgstr "Non ten permisos suficientes"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-#, fuzzy
 msgid "Invalid Evolution backup file"
-msgstr "O arquivo do Evolution non é válido"
+msgstr "O ficheiro de copia de seguranza do Evolution non é válido"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-#, fuzzy
 msgid "Please select a valid backup file to restore."
-msgstr "Seleccione un ficheiro de arquivo válido para restaurar."
+msgstr "Seleccione un ficheiro válido de copia de seguranza para restaurar."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-#, fuzzy
-msgid "The selected folder does not have enough permissions to create the file"
-msgstr "Vostede non ten os permisos suficientes para eliminar este correo."
+msgid "The selected folder is not writable."
+msgstr "Non se pode escribir no cartafol seleccionado."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
@@ -15932,11 +16381,10 @@ msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:565
-#, fuzzy
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+msgid "_Auto-create addressbook entries when replying to messages"
 msgstr ""
-"Crear entradas _automaticamente na axenda de enderezos ao responder o correo"
+"Crear entradas _automaticamente na axenda de enderezos ao responder a "
+"mensaxes"
 
 #: ../plugins/bbdb/bbdb.c:571
 msgid "Select Address book for Automatic Contacts"
@@ -15948,18 +16396,14 @@ msgstr "Mensaxe instantánea de contactos"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:601
-#, fuzzy
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
-"Sincronizar periodicamente a información e as imaxes de contacto desde a "
-"lista de amigos do Gaim"
+"Sincronizar información e as imaxes de contacto desde a lista de amigos do "
+"Pidgin"
 
 #: ../plugins/bbdb/bbdb.c:607
-#, fuzzy
 msgid "Select Address book for Pidgin buddy list"
-msgstr "Seleccione a axenda de enderezos para a lista de amigos do Gaim"
+msgstr "Seleccione a axenda de enderezos para a lista de amigos do Pidgin"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:618
@@ -15982,34 +16426,32 @@ msgstr "BBDB"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while spawning %s: %s."
-msgstr "Ocorreu un erro ao imprimir"
+msgstr "Ocorreu un erro ao crear %s: %s."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
-msgstr ""
+msgstr "O proceso fillo Bofotilter non responde, matándoo..."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr ""
+msgstr "A espera polo proceso fillo Bogofilter interrompeuse, rematando..."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr ""
+msgstr "Fallou a tubería cara Bogofilter, código de erro: %d"
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
-#, fuzzy
 msgid "Convert message text to _Unicode"
 msgstr "Converter o texto do correo a _Unicode"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-#, fuzzy
 msgid "Convert mail messages to Unicode"
-msgstr "Converter o texto do correo a Unicode"
+msgstr "Converter as mensaxes do correo a Unicode"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
 msgid ""
@@ -16020,30 +16462,28 @@ msgstr ""
 "ham que veñen de diferentes conxuntos de caracteres."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-#, fuzzy
 msgid "Bogofilter Options"
-msgstr "Rexistrar accións de filtraxe"
+msgstr "Opcións de Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-#, fuzzy
 msgid "Bogofilter junk plugin"
-msgstr "Rexistrar accións de filtraxe"
+msgstr "Plugin de correo non desexado de Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
-msgstr ""
+msgstr "Filtrar o correo non desexado usando Bogofilter."
 
 #: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:135
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:351
+#: ../plugins/google-account-setup/google-source.c:671
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
@@ -16063,19 +16503,17 @@ msgstr "Calendarios locais"
 msgid "Provides core functionality for local calendars."
 msgstr "Proporciona funcionalidade básica para calendarios locais."
 
-#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:375
-#, fuzzy
+#: ../plugins/google-account-setup/google-source.c:695
 msgid "Re_fresh:"
-msgstr "Ac_tualizar"
+msgstr "Ac_tualizar:"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "Conexión _segura"
 
-#: ../plugins/calendar-http/calendar-http.c:406
-#, fuzzy
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "_Nome de usuario:"
 
@@ -16179,29 +16617,25 @@ msgstr ""
 "predeterminado?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:691
+#: ../shell/main.c:679
 msgid "Evolution"
 msgstr "Evolution"
 
 #: ../plugins/default-source/default-source.c:81
-#, fuzzy
 msgid "Mark as _default address book"
-msgstr "Marcar como cartafol _predeterminado"
+msgstr "Marcar como axenda de enderezos _predeterminado"
 
 #: ../plugins/default-source/default-source.c:102
-#, fuzzy
 msgid "Mark as _default calendar"
-msgstr "Marcar como cartafol _predeterminado"
+msgstr "Marcar como calendario _predeterminado"
 
 #: ../plugins/default-source/default-source.c:103
-#, fuzzy
 msgid "Mark as _default task list"
-msgstr "Marcar como cartafol _predeterminado"
+msgstr "Marcar como lista de tarefas _predeterminada"
 
 #: ../plugins/default-source/default-source.c:104
-#, fuzzy
 msgid "Mark as _default memo list"
-msgstr "Marcar como cartafol _predeterminado"
+msgstr "Marcar como lista de notas _predeterminada"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -16215,33 +16649,44 @@ msgstr ""
 "Proporciona funcionalidade para marcar calendarios ou axendas de enderezos "
 "como opción predeterminada."
 
-#: ../plugins/email-custom-header/email-custom-header.c:541
-#, fuzzy
+#: ../plugins/email-custom-header/email-custom-header.c:562
 msgid "_Custom Header"
-msgstr "Cabeceiras personalizadas"
+msgstr "_Cabeceira personalizada"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-#, fuzzy
-msgid "Custom Header Options"
-msgstr "Cabeceiras personalizadas"
+#: ../plugins/email-custom-header/email-custom-header.c:883
+msgid "Key"
+msgstr "Chave"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Valores"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:2
-#, fuzzy
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+"O formato para especificar o valor dunha chave de cabeceira personalizada "
+"é:\n"
+"Valores chave do nome da cabeceira personalizada separados por \";\"."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
 msgid "Email Custom Header"
-msgstr "Cabeceiras personalizadas"
+msgstr "Cabeceira personalizada de correo"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
 msgid "Adds custom header to outgoing messages."
-msgstr ""
+msgstr "Engade unha cabeceira personalizada ás mensaxes saíntes."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
-#, fuzzy
 msgid "Custom Header"
-msgstr "Cabeceiras personalizadas"
+msgstr "Cabeceira personalizada"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Header"
+msgid "List of Custom Headers"
 msgstr "Lista de cabeceiras personalizadas"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
@@ -16250,6 +16695,10 @@ msgid ""
 "message. The format for specifying a Header and Header value is: Name of the "
 "custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
+"A chave especifica a lista de cabeceiras personalizadas que pode engadir a "
+"unha mensaxe saínte. O formato para especificar unha cabeceira e un valor de "
+"cabeceira é: Nome da cabeceira personalizada seguida de \"=\" e valores "
+"separados por \";\""
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -16268,12 +16717,12 @@ msgid "_User:"
 msgstr "_Usuario:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:62
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "Contrasinal seguro"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:65
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -16281,11 +16730,11 @@ msgstr ""
 "Esta opción conectará co servidor Exchange usando unha autenticación de "
 "contrasinal segura (NTLM)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:73
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "Contrasinal de texto plano"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:75
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -16293,11 +16742,11 @@ msgstr ""
 "Esta opción conectará co servidor Exchange usando unha autenticación "
 "estándar de texto plano."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:256
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Fóra da oficina"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16305,77 +16754,81 @@ msgstr ""
 "A mensaxe especificada abaixo enviarase automaticamente a cada\n"
 "persoa que lle envíe correo mentres está fóra da oficina."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "Estou fóra da oficina"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "Estou na oficina"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Modificar o contrasinal para a conta do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Cambiar contrasinal"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:334
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Xestione a configuración dos delegados para a conta Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:336
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "Asistente de delegacións"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:348
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Varios"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "Ver o tamaño de todos os cartafoles Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:360
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Tamaño dos cartafoles"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:367
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Configuración do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:624
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "URL _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:650
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "A_utenticar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:853
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "_Caixa de correo:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "Tipo de _autenticación"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:867
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "_Verificar tipos soportados"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:979
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:981
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -16394,7 +16847,7 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
+#: ../plugins/exchange-operations/exchange-change-password.c:113
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
@@ -16402,7 +16855,7 @@ msgstr ""
 "O contrasinal actual non coincide co contrasinal existente para a súa conta. "
 "Introduza o contrasinal correcto"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:120
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Os dous contrasinais non coinciden. Reintroduza os contrasinais."
 
@@ -16427,33 +16880,33 @@ msgstr "O seu contrasinal actual caducou. Cambie o seu contrasinal agora."
 msgid "Your password will expire in the next %d days"
 msgstr "O contrasinal caducará nos seguintes %d días"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Editor (ler, crear, editar)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Autor (ler, crear)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Revisor (só de lectura)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
-msgstr "Permisos delegados"
+msgstr "Delegar permisos"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "Permisos para %s"
@@ -16461,75 +16914,76 @@ msgstr "Permisos para %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
 msgstr ""
+"Esta mensaxe foi enviada automaticamente por Evolution para informalo de que "
+"foi designado como delegado. Agora pode enviar mensaxes no meu nome."
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 msgid "You have been given the following permissions on my folders:"
-msgstr ""
+msgstr "Fóronlle concedidos os seguintes permisos nos meus cartafoles:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:376
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
-msgstr "O _delegado pode ver elementos privados"
+msgstr "Vostede tamén pode ver os meus elementos privados."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
-msgstr ""
+msgstr "Sen embargo non lle está permitido ver os meus elementos privados."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
-msgstr ""
+msgstr "Foi designado como delegado para %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To"
 msgstr "Delegar en"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:580
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Eliminar o delegado %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "Non se puido acceder ao Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Non puido localizarse a si mesmo no Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Non se puido localizar o delegado %s no Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Non se puido eliminar o delegado %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "Non se puido actualizar a lista de delegados."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Non se puido engadir o delegado %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:981
 msgid "Error reading delegates list."
 msgstr "Erro ao ler a lista de delegados."
 
@@ -16569,25 +17023,24 @@ msgid "_Inbox:"
 msgstr "_Caixa de entrada:"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:18
-#, fuzzy
 msgid "_Summarize permissions"
-msgstr "Permisos delegados"
+msgstr "_Resumir permisos"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:60
+#: ../plugins/exchange-operations/exchange-folder-permission.c:59
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Permisos..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
 msgid "Folder Name"
 msgstr "Nome do cartafol"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
 msgid "Folder Size"
 msgstr "Tamaño do cartafol"
 
@@ -16596,7 +17049,7 @@ msgstr "Tamaño do cartafol"
 msgid "User"
 msgstr "Usuario"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Subscribirse ao cartafol doutro usuario"
@@ -16605,20 +17058,20 @@ msgstr "Subscribirse ao cartafol doutro usuario"
 msgid "Exchange Folder Tree"
 msgstr "Árbore de cartafol do Exchange"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:235
-#: ../plugins/exchange-operations/exchange-folder.c:245
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:234
+#: ../plugins/exchange-operations/exchange-folder.c:244
 msgid "Unsubscribe Folder..."
 msgstr "Eliminar subscrición do cartafol..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:519
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Está seguro de que quere eliminar subscrición do cartafol \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:531
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Eliminar subscrición de \"%s\""
@@ -16683,18 +17136,18 @@ msgstr "O seu contrasinal caducará en 7 días..."
 msgid "_Change Password"
 msgstr "_Cambiar contrasinal"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(Permiso denegado.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
 msgid "Add User:"
 msgstr "Engadir usuario:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
-#: ../plugins/exchange-operations/exchange-send-options.c:417
-#: ../plugins/groupwise-features/proxy.c:946
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../plugins/groupwise-features/proxy.c:934
+#: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
 msgstr "Engadir usuario"
 
@@ -16814,13 +17267,13 @@ msgstr "_Usuario"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:17
 msgid "button-user"
-msgstr ""
+msgstr "button-user"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Seleccionar usuario"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "Axenda de enderezos..."
 
@@ -16834,7 +17287,7 @@ msgstr "Subscribirse ao calendario doutro usuario"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
 msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
+"A plugin that manages a collection of Exchange account specific operations "
 "and features."
 msgstr ""
 "Un plugin que manipula unha colección de operacións e características "
@@ -16928,10 +17381,16 @@ msgid "Could not update out-of-office state"
 msgstr "Non se puido actualizar o estado \"Fóra da oficina\""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+"Evolution require reiniciarse para cargar a caixa de correo do usuario "
+"subscrito"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "A conta do Exchange está sen conexión."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16958,32 +17417,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Fallo ao actualizar delegados:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "O cartafol xa existe"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "O cartafol non existe"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Cartafol sen conexión"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "Erro xenérico"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "Non é posible atinxir o servidor de catálogo global"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -16991,76 +17450,77 @@ msgstr ""
 "Se OWA se está executando nun camiño diferente, debe especificalo no diálogo "
 "de configuración de conta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "A caixa de correo de {0} non está neste servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "Asegúrese de que o URL é correcto e ténteo de novo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 "Asegúrese de que o nome do servidor está escrito correctamente e ténteo de "
 "novo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 "Asegúrese de que o nome do usuario e o contrasinal son correctos e ténteo de "
 "novo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr ""
 "Non hai ningún servidor de catálogo global configurado para esta conta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "Non hai ningunha caixa de correo para o usuario {0} en {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Non existe ese usuario {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "Contrasinal modificado correctamente."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
+"Introduza un ID de delegado ou desmarque a opción de Enviar como delegado."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Asegúrese de que o nome do servidor de catálogo global é correcto."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Reinicie o Evolution para que sexan efectivas as modificacións"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Seleccione un usuario."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "O servidor rexeitou o contrasinal porque é demasiado débil."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "A conta do Exchange desactivarase ao saír do Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "A conta do Exchange eliminarase ao saír do Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "O servidor Exchange non é compatible co Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17068,7 +17528,7 @@ msgstr ""
 "O servidor está executando o Exchange 5.5. Exchange Connector \n"
 "só soporta o Microsoft Exchange 2000 e 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17082,58 +17542,59 @@ msgstr ""
 "\n"
 "Ou pode que só escribira incorrectamente o contrasinal."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "Ténteo de novo cun contrasinal diferente."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "Non é posible engadir o usuario á lista de control de acceso:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Non é posible editar os delegados."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Erro descoñecido ao buscar {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/google-account-setup/google-source.c:597
 msgid "Unknown error."
 msgstr "Erro descoñecido."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Tipo descoñecido"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Operación non soportada"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "Está próximo á súa cota dispoñible para almacenar correo neste servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
-msgstr ""
+msgstr "Permíteselle enviar unha mensaxe no nome dun só delegado de cada vez."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "Non pode converterse no seu propio delegado"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Excedeu a súa cota para almacenar correo neste servidor."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "Só pode configurar unha conta do Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -17141,14 +17602,14 @@ msgstr ""
 "O seu uso actual é: {0}KB. Tente liberar algo de espazo eliminando algún "
 "correo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr ""
 "O seu uso actual é: {0}KB. Non poderá nin enviar nin recibir correos agora."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17156,19 +17617,19 @@ msgstr ""
 "O seu uso actual é: {0}KB. Non poderá enviar correos até que libere algo de "
 "espazo eliminando algún correo."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "O seu contrasinal caducou."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} non pode engadirse á lista de control de acceso"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} xa é un delegado"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} xa está na lista"
 
@@ -17186,13 +17647,15 @@ msgstr "Editor externo predeterminado"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 msgid "The default command that must be used as the editor."
-msgstr ""
+msgstr "O comando predeterminado a usar como editor."
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
 "A plugin for using an external editor as the composer. You can send only "
 "plain-text messages."
 msgstr ""
+"Un plugin para usar un editor externo para as mensaxes. Só pode enviar "
+"mensaxes de texto plano."
 
 #. the path to the shared library
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
@@ -17205,23 +17668,27 @@ msgstr "Non se pode crear o ficheiro temporal"
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
 msgid "Editor not launchable"
-msgstr ""
+msgstr "Non se pode lanzar o editor"
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
 msgstr ""
+"Evolution non pode crear un ficheiro temporal para gardar o seu correo. "
+"Ténteo máis tarde."
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 msgstr ""
+"Non se pode lanzar o editor externo axustado nas preferencias do "
+"complemento  Ténteo establecendo un editor distinto."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "Compoñer nun editor externo"
+msgid "Compose in _External Editor"
+msgstr "Compoñer nun editor _externo"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
@@ -17241,7 +17708,7 @@ msgstr ""
 
 #: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
-msgstr ""
+msgstr "Elixa unha imaxe (48*48) png de tamaño < 700bytes"
 
 #: ../plugins/face/face.c:68
 msgid "PNG files"
@@ -17257,6 +17724,10 @@ msgid ""
 "configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
 "faces This will be used in messages that are sent further."
 msgstr ""
+"Engade unha cara aos mensaxes saíntes. Primeiro, o usuario necesita "
+"configurar unha imaxe png de 48*48. A imaxe codificarase en base64 e "
+"gardarase en ~/.evolution/faces. A imaxe usarase nas mensaxes que se envíen "
+"a partir dese momento."
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
@@ -17281,21 +17752,64 @@ msgstr "Eliminar subscrición de cartafoles"
 msgid "_Unsubscribe"
 msgstr "E_liminar subscrición"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
-#, fuzzy
+#: ../plugins/google-account-setup/google-source.c:83
+#: ../plugins/google-account-setup/google-source.c:90
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
-msgstr "conmutar"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-source.c:493
+msgid "Please enter user name first."
+msgstr "Introduza primeiro o nome de usuario."
+
+#: ../plugins/google-account-setup/google-source.c:497
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr ""
+"Introduza o contrasinal para que o usuario %s poida acceder á lista de "
+"calendarios subscritos."
+
+#: ../plugins/google-account-setup/google-source.c:597
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"Non se poden ler os datos do servidor de Google.\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:747
+msgid "Cal_endar:"
+msgstr "Cal_endario:"
+
+#: ../plugins/google-account-setup/google-source.c:782
+msgid "Retrieve _list"
+msgstr "Recuperando _lista"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+msgid "<b>Server</b>"
+msgstr "<b>Servidor</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+msgid "Username:"
+msgstr "Nome de usuario:"
+
+#. Translators: This is the first half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
+#: ../plugins/google-account-setup/google-contacts-source.c:233
+msgid "Update every"
+msgstr "Actualizar cada"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-#, fuzzy
-msgid "A plugin to setup google calendar."
-msgstr "Plugin para configurar as orixes do calendario hula."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "Un plugin para configurar o calendario e contactos de Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-#, fuzzy
 msgid "Google sources"
-msgstr "Recursos"
+msgstr "Fontes de Google"
 
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
@@ -17379,10 +17893,22 @@ msgid "_Junk List"
 msgstr "Lista de _correo non desexado"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr "Anulación da mensaxe"
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+"Anular unha mensaxe pode eliminala da caixa de correo dos destinatarios. "
+"Está seguro que de quere facer isto?"
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr "Mensaxe anulada con éxito"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "Anular correo"
 
@@ -17390,12 +17916,6 @@ msgstr "Anular correo"
 msgid "Add Send Options to groupwise messages"
 msgstr "Engadir opcións de envío ás mensaxes de Groupwise"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Opcións de envío"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Un plugin para as características nas contas Groupwise."
@@ -17405,14 +17925,12 @@ msgid "Groupwise Features"
 msgstr "Características do Groupwise"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
-#, fuzzy
 msgid "Message retract failed"
-msgstr "Mensaxe anulada con éxito"
+msgstr "Fallou a anulación da mensaxe"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
-#, fuzzy
 msgid "The server did not allow the selected message to be retracted."
-msgstr "Converte a mensaxe seleccionada nunha tarefa nova"
+msgstr "O servidor non permite que se anule a mensaxe seleccionada."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
@@ -17421,9 +17939,8 @@ msgid "Invalid user"
 msgstr "Usuario non válido"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
-#, fuzzy
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "Non se pode gardar no ficheiro &quot;{0}&quot;."
+msgstr "Non se pode dar acceso ao Proxy ao usuario &quot;{0}&quot;"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
@@ -17431,18 +17948,17 @@ msgid "Specify User"
 msgstr "Especificar usuario"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#, fuzzy
 msgid "You have already given proxy permissions to this user."
-msgstr "Vostede non ten os permisos suficientes para eliminar este correo."
+msgstr "Xa lle dera permisos a este usuario para acceder ao proxy."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr ""
+"Ten que especificar un nome de usuario válido para darlle acceso ao proxy."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
-#, fuzzy
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "Xa existe un cartafol chamado &quot;{0}&quot;. Use un nome diferente."
+msgstr "Xa existe a conta &quot;{0}&quot;. Comprobe a súa árbore de cartafois."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
 msgid "Account Already Exists"
@@ -17450,27 +17966,31 @@ msgstr "A conta xa existe"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
 msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
 msgstr ""
+"Non se puido iniciar sesión no proxy como &quot;{0}&quot;. Comprobe o "
+"enderezo de correo e ténteo de novo."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
-#, fuzzy
 msgid "This is a recurring meeting"
-msgstr "Converter en evento recorrente"
+msgstr "Este é un evento recorrente"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-#, fuzzy
-msgid "What would you like to {0}?"
-msgstr "Quere gardar os cambios?"
+msgid "Would you like to accept it?"
+msgstr "Quere aceptalo?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
-msgstr "Non pode compartir o cartafol co usuario especificado \"{0}\""
+msgid "Would you like to decline it?"
+msgstr "Quere descartalo?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "Non pode compartir o cartafol co usuario especificado &quot;{0}&quot;"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "You have to specify a user name whom you want to add to the list"
-msgstr ""
+msgstr "Ten que especificar o nome do usuario que quere engadir á lista"
 
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
@@ -17570,9 +18090,9 @@ msgstr "<b>Nome da conta</b>"
 msgid "Proxy Login"
 msgstr "Iniciar sesión no proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -17581,21 +18101,21 @@ msgstr "%s Introduza o seu contrasinal para %s (usuario %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:521
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "Iniciar sesión no _proxy..."
 
-#: ../plugins/groupwise-features/proxy.c:703
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "O separador do proxy estará dispoñible só cando a conta estea en liña."
 
-#: ../plugins/groupwise-features/proxy.c:708
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "O separador do proxy estará dispoñible só cando a conta estea activada."
 
 #: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Usuarios"
 
@@ -17611,15 +18131,15 @@ msgstr "Novo cartafol _compartido..."
 msgid "Sharing"
 msgstr "Compartir"
 
-#: ../plugins/groupwise-features/share-folder.c:544
+#: ../plugins/groupwise-features/share-folder.c:533
 msgid "Custom Notification"
 msgstr "Notificación personalizada"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "Engadir   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "Modificar"
 
@@ -17684,11 +18204,11 @@ msgstr "Plugin para configurar as orixes do calendario hula."
 msgid "Hula Account Setup"
 msgstr "Configuración da conta hula"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "Cabeceiras personalizadas"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "Cabeceiras IMAP"
 
@@ -17763,7 +18283,7 @@ msgid "Select Calendar"
 msgstr "Seleccionar calendario"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:703
+#: ../shell/e-shell-importer.c:700
 msgid "_Import"
 msgstr "_Importar"
 
@@ -17778,38 +18298,39 @@ msgstr "Importa anexos ICS ao calendario."
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:34
 msgid "Hardware Abstraction Layer not loaded"
-msgstr ""
+msgstr "Non se cargou a capa de abstracción de hardware"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:35
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
 msgstr ""
+"Requírese o servizo \"hald\" e actualmente non está funcionando. Habilite o "
+"servizo e volva a executar este programa ou contacte co seu administrador do "
+"sistema."
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:68
 msgid "Search for an iPod failed"
-msgstr ""
+msgstr "Fallou a busca dun iPod"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:69
-#, fuzzy
 msgid ""
 "Evolution could not find an iPod to synchronize with. Either the iPod is not "
 "connected to the system or it is not powered on."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">A busca dun iPod fallou</span>\n"
-"\n"
 "O Evolution non puido encontrar un iPod co que sincronizarse. Ou o iPod non "
 "está conectado ao sistema ou non está encendido."
 
-#: ../plugins/ipod-sync/ical-format.c:123
-#: ../plugins/save-calendar/ical-format.c:167
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "Formato iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-#, fuzzy
 msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
-msgstr "Sincronizar a tarefa/calendario/axenda de enderezos con Apple iPod"
+msgstr ""
+"Sincronizar a tarefa/nota/calendario/axenda de enderezos seleccionada co "
+"Apple iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -17913,9 +18434,8 @@ msgid "Attendee status updated"
 msgstr "Estado de participación actualizado"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1276
-#, fuzzy
 msgid "Meeting information sent"
-msgstr "Información da reunión"
+msgstr "Enviouse información da reunión"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid "Task information sent"
@@ -17927,16 +18447,15 @@ msgstr "Enviada información de nota"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1291
 msgid "Unable to send meeting information, the meeting does not exist"
-msgstr ""
+msgstr "Non se pode enviar a información da reunión, a reunión non existe"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1294
-#, fuzzy
 msgid "Unable to send task information, the task does not exist"
-msgstr "Non é posible localizar esta tarefa en ningunha lista de tarefas"
+msgstr "Non é posible enviar a información da tarefa, a tarefa non existe"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1297
 msgid "Unable to send memo information, the memo does not exist"
-msgstr ""
+msgstr "Non se pode enviar a información da nota, a nota non existe"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1366
 #: ../plugins/itip-formatter/itip-formatter.c:1377
@@ -17952,15 +18471,15 @@ msgstr ""
 "A mensaxe di que contén un calendario mais o calendario non é un iCalendar "
 "válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
-#: ../plugins/itip-formatter/itip-formatter.c:1431
-#: ../plugins/itip-formatter/itip-formatter.c:1513
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "The item in the calendar is not valid"
 msgstr "O elemento no calendario non é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1414
-#: ../plugins/itip-formatter/itip-formatter.c:1432
-#: ../plugins/itip-formatter/itip-formatter.c:1514
+#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1437
+#: ../plugins/itip-formatter/itip-formatter.c:1519
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17968,11 +18487,11 @@ msgstr ""
 "A mensaxe contén un calendario mais o calendario non contén eventos, tarefas "
 "nin información de dispoñibilidade"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "The calendar attached contains multiple items"
 msgstr "O calendario anexo contén múltiples elementos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1444
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17980,327 +18499,328 @@ msgstr ""
 "Para procesar todos estes elementos, debería gardarse o ficheiro e "
 "importarse o calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2143
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
-msgstr "Esta cita _repítese"
+msgstr "Esta cita repítese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2146
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
-msgstr "Esta cita _repítese"
+msgstr "Esta tarefa repítese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2149
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
-msgstr "Esta cita _repítese"
+msgstr "Esta nota repítese"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2378
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "E_liminar a mensaxe despois de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2388
-#: ../plugins/itip-formatter/itip-formatter.c:2420
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "Buscar conflito"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2403
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione os calendarios nos que buscar conflitos entre reunións"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:300
+#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "Hoxe"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:195
 msgid "Today %H:%M"
 msgstr "Hoxe ás %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:199
 msgid "Today %H:%M:%S"
 msgstr "Hoxe ás %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:208
 msgid "Today %l:%M:%S %p"
 msgstr "Hoxe ás %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:218
 msgid "Tomorrow"
 msgstr "Mañá"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow %H:%M"
 msgstr "Mañá ás %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:227
 msgid "Tomorrow %H:%M:%S"
 msgstr "Mañá ás %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %l:%M %p"
 msgstr "Mañá ás %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:236
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Mañá ás %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../plugins/itip-formatter/itip-view.c:255
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:260
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:266
+#: ../plugins/itip-formatter/itip-view.c:264
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:275
+#: ../plugins/itip-formatter/itip-view.c:273
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e"
 msgstr "%A, %e de %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:288
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e de %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:292
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e de %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e de %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e de %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:307
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e de %B de %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e de %B de %Y ás %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:316
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e de %B de %Y, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e de %B de %Y, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:325
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e de %B de %Y, %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:526
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
-msgstr ""
+msgstr "Responda e nome de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
-msgstr ""
+msgstr "Recibido en nome de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:357
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> publicou a seguinte información de reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:359
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> publicou a seguinte información de reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> delegoulle a reunión seguinte:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> require a súa presenza na seguinte reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> require a súa presenza na seguinte reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:375
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> quere apuntarse a unha reunión existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:377
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> quere apuntarse a unha reunión existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:381
+#, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
-msgstr "<b>%s</b> quere recibir a última información da seguinte reunión:"
+msgstr ""
+"<b>%s</b> quere recibir a través de %s a última información da seguinte "
+"reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> quere recibir a última información da seguinte reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:387
+#, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> devolveu a seguinte resposta á reunión:"
+msgstr "<b>%s</b> devolveu a través de %s a seguinte resposta á reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:389
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> devolveu a seguinte resposta á reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:393
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> a través de %s cancelou a seguinte reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:395
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> cancelou a reunión seguinte."
 
-#: ../plugins/itip-formatter/itip-view.c:401
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:399
+#, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr "<b>%s</b> propuxo as seguintes modificacións para a reunión."
+msgstr ""
+"<b>%s</b> a través de %s propuxo as seguintes modificacións para a reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:401
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> propuxo as seguintes modificacións para a reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:405
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr ""
 "<b>%s</b> rexeitou as seguintes modificacións para a reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:407
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> rexeitou as seguintes modificacións para a reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:445
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> publicou a seguinte tarefa a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> publicou a tarefa seguinte:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> require a asignación de %s para a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:455
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> a través de %s asignoulle unha tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> asignoulle unha tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:463
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> a través de %s quere engadirse a unha tarefa existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:465
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> quere engadirse a unha tarefa existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:469
+#, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
 msgstr ""
-"<b>%s</b> quere recibir a última información para a seguinte tarefa asignada:"
+"<b>%s</b> quere recibir a última información a través de %s para a seguinte "
+"tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:471
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18308,129 +18828,132 @@ msgid ""
 msgstr ""
 "<b>%s</b> quere recibir a última información para a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:475
+#, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr "<b>%s</b> devolveu a seguinte resposta á tarefa asignada:"
+msgstr ""
+"<b>%s</b> devolveu a través de %s a seguinte resposta á tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:477
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> devolveu a seguinte resposta á tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:481
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> a través de %s cancelou a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:483
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> cancelou a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:487
+#, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> propuxo as seguintes modificacións na asignación de tarefas:"
+msgstr ""
+"<b>%s</b> propuxo a través de %s as seguintes modificacións na asignación de "
+"tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:489
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> propuxo as seguintes modificacións na asignación de tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:493
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> rexeitou a seguinte tarefa asignada a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:495
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> rexeitou a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:533
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> publicou a seguinte nota a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> publicou a seguinte nota:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:540
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> quere sumarse a unha reunión existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> quere sumarse a unha nota existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> a través de %s cancelou a seguinte nota compartida:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> cancelou a seguinte nota compartida:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:819
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:852
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Decline"
 msgstr "_Rexeitar"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:826
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Accept"
 msgstr "_Aceptar"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Decline all"
 msgstr "_Rexeitar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Tentative all"
 msgstr "_Provisional todo"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:836
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Tentative"
 msgstr "_Provisional"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Accept all"
 msgstr "_Aceptar todo"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Send Information"
 msgstr "_Enviar información"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Update Attendee Status"
 msgstr "_Actualizar o estado do participante"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:849
 msgid "_Update"
 msgstr "_Actualizar"
 
@@ -18514,7 +19037,7 @@ msgstr "Desactivar a conta"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
-msgstr "Emitir ou reproducir ficheiro de son."
+msgstr "Emitir ton de aviso ou reproducir ficheiro de son."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
 msgid "Blink icon in notification area."
@@ -18533,140 +19056,147 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Xera unha mensaxe D-BUS ao chegar mensaxes novas."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-#, fuzzy
 msgid ""
-"If true, then beep, otherwise will play sound file when new messages arrive."
-msgstr "Reproducir un ficheiro de son ao  _chegar correo novo"
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr ""
+"Se está activado emitirá un ton de aviso, senón reproducirá un ficheiro de "
+"son cando chegue correo novo."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
-#, fuzzy
 msgid "Notify new messages for Inbox only."
-msgstr "Movendo mensaxes ao cartafol %s"
+msgstr "Notificar de novas mensaxes só na caixa de entrada."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-#, fuzzy
 msgid "Play sound when new messages arrive."
-msgstr "Reproducir un ficheiro de son ao  _chegar correo novo"
+msgstr "Reproducir un ficheiro de son ao  _chegar correo novo."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Popup message together with the icon."
-msgstr ""
+msgstr "Mensaxe emerxente xunto coa icona."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
-#, fuzzy
 msgid "Show new mail icon in notification area when new messages arrive."
-msgstr "_Non notificarme cando chegue correo novo"
+msgstr ""
+"Amosar icona de novo correo na área de notificación cando chegue correo novo."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
-msgstr ""
+msgstr "Nome do ficheiro de son a reproducir."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
-#, fuzzy
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
-msgstr "Ficheiro de son para reproducir cando chegue un correo novo."
+msgstr ""
+"Ficheiro de son a reproducir cando chegue un correo novo, se non está en "
+"modo ton de aviso."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
-#, fuzzy
 msgid "Whether play sound or beep when new messages arrive."
-msgstr "Reproducir un ficheiro de son ao  _chegar correo novo"
+msgstr ""
+"Indica se reproducir un ficheiro de son ou ton de aviso ao chegar correo "
+"novo."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
-#, fuzzy
 msgid "Whether show message over the icon when new messages arrive."
-msgstr "Xera unha mensaxe D-BUS ao chegar correo novo."
+msgstr "Indica se amosa unha mensaxe sobre a icona ao chegar correo novo."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
-#, fuzzy
 msgid "Whether the icon should blink or not."
-msgstr "Se a barra lateral debería ser visible."
+msgstr "Indica se a icona debe facer intermitencia ou non."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr ""
+"Indica se se deben notificar só as mensaxes no cartafol da bandeixa de "
+"entrada."
 
-#: ../plugins/mail-notification/mail-notification.c:254
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
-msgstr "Xerando a lista de mensaxes"
+msgstr "Xerar unha mensaxe _D-Bus"
+
+#: ../plugins/mail-notification/mail-notification.c:378
+msgid "Evolution's Mail Notification"
+msgstr "Notificación de correo de Evolution"
+
+#: ../plugins/mail-notification/mail-notification.c:399
+msgid "Mail Notification Properties"
+msgstr "Propiedades da notificación de correo"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
-#, fuzzy, c-format
+#: ../plugins/mail-notification/mail-notification.c:458
+#, c-format
 msgid ""
 "You have received %d new message\n"
 "in %s."
 msgid_plural ""
 "You have received %d new messages\n"
 "in %s."
-msgstr[0] "Recibiu %d mensaxes novas en %s."
-msgstr[1] "Recibiu %d mensaxes novas en %s."
+msgstr[0] ""
+"Recibiu %d mensaxe nova\n"
+"en %s."
+msgstr[1] ""
+"Recibiu %d mensaxes novas\n"
+"en %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
-#, fuzzy, c-format
+#: ../plugins/mail-notification/mail-notification.c:463
+#, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
-msgstr[0] "Recibiu %d mensaxe nova en %s."
-msgstr[1] "Recibiu %d mensaxe nova en %s."
+msgstr[0] "Recibiu %d mensaxe nova."
+msgstr[1] "Recibiu %d mensaxes novas."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
 msgid "New email"
 msgstr "Novo correo"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:542
 msgid "Show icon in _notification area"
 msgstr "Mostrar icona na área de _notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:443
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:545
 msgid "B_link icon in notification area"
-msgstr "_Personalizar a mensaxe de notificación"
+msgstr "_Facer intermitencia a icona na área de notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:547
 msgid "Popup _message together with the icon"
-msgstr ""
+msgstr "_Mensaxe emerxente xunto coa icona"
 
-#: ../plugins/mail-notification/mail-notification.c:626
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:728
 msgid "_Play sound when new messages arrive"
 msgstr "Reproducir un ficheiro de son ao  _chegar correo novo"
 
-#: ../plugins/mail-notification/mail-notification.c:632
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "_Beep"
-msgstr "Ton de aviso"
+msgstr "_Ton de aviso"
 
-#: ../plugins/mail-notification/mail-notification.c:633
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:735
 msgid "Play _sound file"
-msgstr "Seleccionar un ficheiro de son"
+msgstr "Reproducir un ficheiro de _son"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Specify _filename:"
 msgstr "Especificar o nome de _ficheiro:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Select sound file"
 msgstr "Seleccionar un ficheiro de son"
 
-#: ../plugins/mail-notification/mail-notification.c:646
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Pl_ay"
-msgstr "Palau"
+msgstr "_Reproducir"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:805
 msgid "Notify new messages for _Inbox only"
-msgstr ""
+msgstr "Notificar novas mensaxes só para a _bandexa de entrada"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-#, fuzzy
 msgid ""
 "Generates a D-Bus message or notifies the user with an icon in notification "
 "area and a notification message whenever a new message has arrived."
 msgstr ""
-"Avisa ao usuario coa icona da bandexa e unha mensaxe de notificación cando "
-"chega unha nova mensaxe."
+"Xera unha mensaxe de D-Bus ou notifica ao usuario cunha icona na área de "
+"notificación e unha mensaxe de notificación cando chega unha nova mensaxe."
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
@@ -18689,15 +19219,17 @@ msgid "Mail to meeting"
 msgstr "Correo para a reunión"
 
 #: ../plugins/mail-to-task/mail-to-task.c:270
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open calendar. %s"
-msgstr "Non se puido abrir o ficheiro"
+msgstr "Non se puido abrir o calendario %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:275
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr ""
+"A fonte seleccionada é de só lectura, por iso non se pode crear unha tarefa "
+"aquí. Elixa outra fonte."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid ""
@@ -18806,12 +19338,12 @@ msgstr "Quere enviar unha mensaxe á lista de correo?"
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
 "A acción non se puido efectuar. Isto significa que a cabeceira para esta "
-"acción non contén ningunha acción que se poida manipular.\n"
+"acción non contiña ningunha acción que se puidera manipular.\n"
 "\n"
 "Cabeceira: {0}"
 
@@ -18891,29 +19423,24 @@ msgid "_Unsubscribe from List"
 msgstr "E_liminar subscrición da lista"
 
 #: ../plugins/mark-all-read/mark-all-read.c:37
-#, fuzzy
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "Marcar todas as mensaxes nos subcartafoles como lidas?"
+msgid "Also mark messages in subfolders?"
+msgstr "Marcar tamén as mensaxes no subcartafoles?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:39
-#, fuzzy
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "Quere que se realice esta operación nos subcartafoles?"
-
-#: ../plugins/mark-all-read/mark-all-read.c:85
-#, fuzzy
-msgid "Mark All Messages as Read"
-msgstr "Ma_rcar todas as mensaxes como lidas"
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr ""
+"Quere marcar as mensaxes como lidas só no cartafol actual, ou no cartafol "
+"actual e tamén en todos os seus subcartafoles?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:162
-#, fuzzy
 msgid "Current Folder and _Subfolders"
-msgstr "Crear subcartafoles"
+msgstr "Cartafol actual e _subcartafoles"
 
 #: ../plugins/mark-all-read/mark-all-read.c:174
-#, fuzzy
 msgid "Current _Folder Only"
-msgstr "Cartafol actual"
+msgstr "Soamente o _cartafol actual"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
@@ -18936,14 +19463,12 @@ msgid "Marks the selected calendar for offline viewing."
 msgstr "Marca o calendario seleccionado para visualizalo sen conexión."
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-#, fuzzy
 msgid "_Do not make available for offline use"
-msgstr "_Non facer isto dispoñible sen conexión"
+msgstr "_Non facer isto dispoñible para usalo sen conexión"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-#, fuzzy
 msgid "_Make available for offline use"
-msgstr "_Marcar o calendario para o uso sen conexión"
+msgstr "_Facer isto dispoñible para usalo sen conexión"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
@@ -18959,7 +19484,7 @@ msgstr "Plugin para xestionar que plugins están activados ou desactivados."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "Xestor de plugin"
 
@@ -18971,35 +19496,24 @@ msgstr "Activar e desactivar plugins"
 msgid "_Plugins"
 msgstr "_Plugins"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:42
 msgid "Author(s)"
 msgstr "Autor(es)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Descrición"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "Configuración"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Nota: algunhas modificacións non serán efectivas até que reinicie"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
-#, fuzzy
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
-msgstr "Revisar"
+msgstr "Vista xeral"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-#, fuzzy
-msgid "Configuration"
-msgstr "Configuración do correo"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr ""
-
-#: ../plugins/plugin-manager/plugin-manager.c:338
-#: ../plugins/plugin-manager/plugin-manager.c:400
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -19024,22 +19538,21 @@ msgstr "Modo de texto plano"
 msgid "Prefer plain-text"
 msgstr "Preferir texto plano"
 
-#: ../plugins/prefer-plain/prefer-plain.c:179
+#: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
 msgstr "Mostrar HTML se está presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:180
+#: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
 msgstr "Preferir PLANO"
 
-#: ../plugins/prefer-plain/prefer-plain.c:181
+#: ../plugins/prefer-plain/prefer-plain.c:176
 msgid "Only ever show PLAIN"
 msgstr "Mostrar só PLANO"
 
-#: ../plugins/prefer-plain/prefer-plain.c:224
-#, fuzzy
+#: ../plugins/prefer-plain/prefer-plain.c:219
 msgid "HTML _Mode"
-msgstr "Modo HTML"
+msgstr "Modo _HTML"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
@@ -19153,50 +19666,72 @@ msgstr ""
 "Dispoñibilidade\n"
 "iCal"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hello Python"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Probas de carga dos complementos Python"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Complemento de proba de Python"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Probar o complemento para o cargador Python EPlugin."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr "Un complemento que carga outros complementos escritos en Python."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "Cargador de Python"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (integrado)"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "SpamAssassin not found, code: %d"
-msgstr "Plugin de correo non desexado SpamAssassin"
+msgstr "Non se atopou SpamAssassin, código: %d"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:150
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to create pipe: %s"
-msgstr "Fallo ao crear o almacenamento de correo local `%s': %s"
+msgstr "Fallo ao crear a canalización: %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "Error after fork: %s"
-msgstr ""
-"Erro en %s:\n"
-" %s"
+msgstr "Erro despois de bifurcar: %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:244
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
-msgstr ""
+msgstr "O proceso fillo de SpamAssasin non está respondendo, matándoo..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:246
 #, c-format
 msgid "Wait for Spamassassin child process interrupted, terminating..."
 msgstr ""
+"Espere a que o proceso fillo de SpamAssasin se interrompa, rematanado..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:255
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr ""
+msgstr "Fallou a tubería cara SpamAssasin, código de erro: %d"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:498
-#, fuzzy, c-format
+#, c-format
 msgid "SpamAssassin is not available."
-msgstr "As opcións de envío non están dispoñibles."
+msgstr "SpamAssassin non está dispoñible."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:865
-#, fuzzy
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Isto fará que o SpamAssasin sexa máis fiable, aínda que máis lento"
 
@@ -19217,9 +19752,8 @@ msgid "SpamAssassin junk plugin"
 msgstr "Plugin de correo non desexado SpamAssassin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-#, fuzzy
 msgid "Spamassassin Options"
-msgstr "SpamAssassin (integrado)"
+msgstr "Opcións de SpamAssassin"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -19228,7 +19762,7 @@ msgstr ""
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:330
+#: ../plugins/save-attachments/save-attachments.c:314
 msgid "Save attachments"
 msgstr "Gardar anexos"
 
@@ -19240,16 +19774,15 @@ msgstr "Gardar anexos..."
 msgid "Save all attachments"
 msgstr "Gardar todos os anexos"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "Seleccionar un nome base para gardar"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "Gardar"
 
@@ -19257,79 +19790,79 @@ msgstr "Gardar"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:166
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "Lista de descrición"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "Lista de categorías"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "Lista de comentarios"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "Creado"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "Lista de contactos"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "Comezar"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "Finalizar"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "porcentaxe feita"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "Lista de participantes"
 
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../plugins/save-calendar/csv-format.c:535
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "Opcións avanzadas para o formato CSV"
 
-#: ../plugins/save-calendar/csv-format.c:542
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "Antepor unha cabeceira"
 
-#: ../plugins/save-calendar/csv-format.c:551
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "Delimitador de valor:"
 
-#: ../plugins/save-calendar/csv-format.c:557
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "Delimitador de rexistro:"
 
-#: ../plugins/save-calendar/csv-format.c:563
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "Encapsular valores con:"
 
-#: ../plugins/save-calendar/csv-format.c:585
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "Formato de valores separados por comas (.csv)"
 
@@ -19350,15 +19883,15 @@ msgstr "Gardar no _disco"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:153
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:380
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:165
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "Seleccione ficheiro de destino"
 
@@ -19375,21 +19908,20 @@ msgid "Show _only this Calendar"
 msgstr "_Mostrar só este calendario"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-#, fuzzy
 msgid "Show _only this Memo List"
-msgstr "Mostrar _só esta lista de tarefas"
+msgstr "Mostrar _só esta lista de notas"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
 msgstr "Mostrar _só esta lista de tarefas"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "Un plugin que manipula o asistente de inicio."
+msgid "Guides you through your initial account setup."
+msgstr "Guíalle pola súa configuración da conta inicial."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "Asistente de inicio"
+msgid "Setup Assistant"
+msgstr "Asistente de configuración"
 
 #: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
@@ -19417,24 +19949,24 @@ msgid "Importing files"
 msgstr "Importar ficheiros"
 
 #: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:144
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione a información que quere importar:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../shell/e-shell-importer.c:397
 #, c-format
 msgid "From %s:"
 msgstr "De: %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../shell/e-shell-importer.c:508
 #, c-format
 msgid "Importing data."
 msgstr "Importando datos."
 
 #: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../shell/e-shell-importer.c:522
 msgid "Please wait"
 msgstr "Espere"
 
@@ -19452,18 +19984,62 @@ msgstr "Encadear mensaxes polo asunto"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
-#, fuzzy
 msgid "F_all back to threading messages by subject"
 msgstr "Volver ao encadeamento de mensaxes polo _asunto"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Lista de pares de palabras chave e valores para o plugin de Modelos para "
+"substituír no corpo dunha mensaxe."
+
+#: ../plugins/templates/templates.c:614
+msgid "No title"
+msgstr "Sen título"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Gardar como _modelo"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Gardar como modelo"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Borradores baseados no plugin de modelos"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
-msgstr ""
+msgstr "Un complemento sinxelo que usa ytnef para decodificar adxuntos TNEF."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-#, fuzzy
 msgid "TNEF Attachment decoder"
-msgstr "Sen anexo"
+msgstr "Decodificador de adxuntos TNEF"
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "Un plugin para configurar os contactos WebDAV."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "Contactos WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgstr "_Evitar IfMatch (necesario en apache < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
@@ -19482,147 +20058,147 @@ msgid "Evolution Test component"
 msgstr "Compoñente de proba do Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-#, fuzzy
-msgid "A string description of the current printer settings."
-msgstr "Unha cadea de descrición da configuración actual de impresora"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Authenticate proxy server connections"
-msgstr ""
+msgstr "Autenticar as conexións do servidor proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Automatic proxy configuration URL"
-msgstr "Recoñecemento automático da ligazón"
+msgstr "URL para a configuración automática do proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Versión de configuración"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Decides whether the crash detection should be run or not."
-msgstr "Se a barra lateral debería ser visible."
+msgstr "Indica se se debe executar ou non o detector de fallos."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Largura predeterminada da barra lateral"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "Altura predeterminada da ventá"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "Estado predeterminado da ventá"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "Largura predeterminada da ventá"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
+"Activar as configuracións do proxy ao acceder HTTP/Secure HTTP en internet."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy host name"
-msgstr ""
+msgstr "Nome do equipo proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy password"
-msgstr "Introduza o contrasinal"
+msgstr "Contrasinal do proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy port"
-msgstr ""
+msgstr "Porto do proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy username"
-msgstr ""
+msgstr "Nome de usuario do proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID ou alias do compoñente que se mostrará por defecto ao iniciar."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and locally stored password in .gnome2_private/."
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
+"Se está activado, as conexións ao servidor proxy requiren autenticación. O "
+"nome de usuario está definido na chave de GConf en \"/apps/evolution/shell/"
+"network_config/authentication_user\" e o contrasinal gárdase por medio de "
+"gnome-keyring ou o ficheiro de contrasinal ~/.gnome2_private/Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
 msgstr "Última versión da configuración actualizada"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Lista de camiños aos cartafoles que se sincronizarán co disco para o uso sen "
 "conexión"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Non-proxy hosts"
-msgstr ""
+msgstr "Equipos que non sexan proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr ""
+msgstr "Contrasinal para pasar como autenticación ao facer HTTP proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "Proxy configuration mode"
-msgstr "Configuración do correo"
+msgstr "Modo de configuración do proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy host name"
-msgstr ""
+msgstr "Nome do equipo proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "SOCKS proxy port"
-msgstr ""
+msgstr "Porto do proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy host name"
-msgstr ""
+msgstr "Nome do equipo proxy HTTP seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Secure HTTP proxy port"
-msgstr ""
+msgstr "Porto do proxy HTTP seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
 "configuration\" and \"use proxy configuration provided in the autoconfig url"
 "\" respectively."
 msgstr ""
+"Elixe o modo de configuración do proxy. Os valores aceptados son 0, 1, 2 e 3 "
+"que representan respectivamente \"usar as configuracións do sistema\", \"sen "
+"proxy\", \"usar a configuración manual do proxy\" e \"usar a URL para a "
+"configuración automática do proxy:\"."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "A barra lateral é visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "Saltar o diálogo de aviso de desenvolvemento"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
-msgstr "Saltar o diálogo de aviso de desenvolvemento"
+msgstr "Saltar o diálogo de aviso de recuperación"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30 ../shell/main.c:577
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
 msgid "Start in offline mode"
 msgstr "Iniciar en modo sen conexión"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "A barra de estado é visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19630,19 +20206,19 @@ msgstr ""
 "A versión de configuración do Evolution, co nivel de configuración maior/"
 "menor (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default height for the main window, in pixels."
 msgstr "Altura predeterminada da ventá principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "The default width for the main window, in pixels."
 msgstr "A largura predeterminada da ventá principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "A largura predeterminada para a barra lateral, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19650,37 +20226,43 @@ msgstr ""
 "A última versión actualizada da configuración do Evolution, con nivel de "
 "configuración maior/menor (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy HTTP through."
-msgstr ""
+msgstr "O nome da máquina pola que se fai proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid "The machine name to proxy secure HTTP through."
-msgstr ""
+msgstr "O nome da máquina pola que se fai proxy HTTP seguro."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy socks through."
-msgstr ""
+msgstr "O nome da máquina pola que se fai proxy socks."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 msgstr ""
+"O porto da máquina definida por \"/apps/evolution/shell/network_config/"
+"http_host\" que fai de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
 msgstr ""
+"O porto da máquina definida por \"/apps/evolution/shell/network_config/"
+"secure_host\" que fai de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
 msgstr ""
+"O porto da máquina definida por \"/apps/evolution/shell/network_config/"
+"socks_host\" que fai de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19690,78 +20272,79 @@ msgstr ""
 "\"toolbar\". Se se selecciona \"toolbar\", o estilo dos botóns determinarase "
 "pola configuración da barra de ferramentas do Gnome."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
 "(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
+"Esta chave contén unha lista de equipos que están conectados directamente, "
+"non a través do proxy (se está activo). Os valores poden ser nomes de "
+"equipos, dominios (usando unha expresión do estilo *.algo.com), enderezos IP "
+"(tanto IPv4 como IPv6) e enderezos de rede coa máscara de rede (do estilo "
+"192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "A barra de ferramentas é visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "URL that provides proxy configuration values."
-msgstr "Última versión da configuración actualizada"
+msgstr "URL que fornece os valores de configuración do proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Use HTTP proxy"
-msgstr ""
+msgstr "Usar proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "User name to pass as authentication when doing HTTP proxying."
-msgstr ""
+msgstr "Nome de usuario a pasar como autenticación ao usar o proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Se o Evolution se iniciará en modo sen conexión en vez de en modo conectado."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether crash detection should be done or not"
-msgstr "Se a barra lateral debería ser visible."
+msgstr "Indica se a detección de fallos debe executarse ou non"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether or not the window should be maximized."
 msgstr "Se a ventá debería ou non estar maximizada."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "Se a barra lateral debería ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the status bar should be visible."
 msgstr "Se a barra de estado debería ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
 msgstr "Se a barra de ferramentas debería ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Se se salta o diálogo de aviso nas versión de desenvolvemento do Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr ""
-"Se se salta o diálogo de aviso nas versión de desenvolvemento do Evolution."
+msgstr "Se se salta o diálogo de aviso cando Evolution se está recuperando."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "Se os botóns da ventá deberían ser visibles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Estilo dos botóns de ventá"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Os botóns da ventá son visibles"
 
@@ -19777,11 +20360,11 @@ msgstr "Conexións activas"
 msgid "Click OK to close these connections and go offline"
 msgstr "Prema en \"Aceptar\" para pechar estas conexións e desconectar"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:132
 msgid "Choose the type of importer to run:"
 msgstr "Seleccione o tipo de importador que se executará:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -19795,11 +20378,11 @@ msgstr ""
 "Pode seleccionar \"Automático\" se non o sabe e o Evolution tentará "
 "averigualo."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid "Choose the destination for this import"
 msgstr "Escolla o destino desta importación"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:147
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -19811,56 +20394,36 @@ msgstr ""
 "localizou ningunha configuración que se poida importar. Se\n"
 "quere tentalo de novo, prema o botón \"Atrás\".\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Nome do _ficheiro:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:299
 msgid "File _type:"
 msgstr "_Tipo de ficheiro:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:335
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos e configuración de programas _antigos"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:338
 msgid "Import a _single file"
 msgstr "Importar un úni_co ficheiro"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-settings-dialog.c:314
 msgid "Evolution Preferences"
 msgstr "Preferencias do Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Non se especificou un nome de cartafol."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "O nome do cartafol non pode conter o carácter Retorno."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "O nome do cartafol non pode conter o carácter \"/\"."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "O nome do cartafol non pode conter o carácter \"#\"."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' e '..' son nomes de cartafol reservados."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:343
-#, fuzzy, c-format
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
+#, c-format
 msgid "%s - Evolution"
-msgstr "Evolution"
+msgstr "%s - Evolution"
 
 #: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
@@ -19883,83 +20446,85 @@ msgstr "Non foi posible executar o Bug buddy."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:742
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
 "Proxecto Trasno"
 
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Sitio web do Evolution"
 
-#: ../shell/e-shell-window-commands.c:771
-#, fuzzy
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
-msgstr "Erro ao abrir o calendario"
+msgstr "Erro ao abrir a páxina web coas FAQ."
 
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "_Traballar con conexión"
 
-#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Traballar sen conexión"
 
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Traballar sen conexión"
 
-#: ../shell/e-shell-window.c:392
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:377
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
-"O Evolution está conectado neste momento. Prema neste botón para traballar "
-"sen conexión."
+"O Evolution está conectado neste momento.\n"
+"Prema neste botón para traballar sen conexión."
 
-#: ../shell/e-shell-window.c:399
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "O Evolution está en proceso de desconexión."
 
-#: ../shell/e-shell-window.c:406
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:391
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
-"O Evolution está actualmente sen conexión. Prema neste botón para traballar "
-"con conexión."
+"O Evolution está actualmente sen conexión.\n"
+"Prema neste botón para traballar con conexión."
 
-#: ../shell/e-shell-window.c:815
+#: ../shell/e-shell-window.c:782
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell.c:640
-#, fuzzy
+#: ../shell/e-shell.c:638
 msgid "Unknown system error."
 msgstr "Erro de sistema descoñecido."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:316
+#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1280
 msgid "Invalid arguments"
 msgstr "Os argumentos non son válidos"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1282
 msgid "Cannot register on OAF"
 msgstr "Non se pode rexistrar en OAF"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1284
 msgid "Configuration Database not found"
 msgstr "Non se localizou a base de datos de configuración"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "Novo"
 
@@ -19968,6 +20533,7 @@ msgid "New Test"
 msgstr "Nova proba"
 
 #: ../shell/test/evolution-test-component.c:108
+msgctxt "New"
 msgid "_Test"
 msgstr "_Proba"
 
@@ -20015,7 +20581,7 @@ msgstr ""
 "ficheiros externos ao Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:234
+#: ../shell/main.c:222
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20052,7 +20618,7 @@ msgstr ""
 "Esperamos que lles sexa de proveito o resultado do noso duro traballo, e\n"
 "agardamos ansiosamente as súas colaboracións.\n"
 
-#: ../shell/main.c:258
+#: ../shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20060,66 +20626,66 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:265
+#: ../shell/main.c:253
 msgid "Do not tell me again"
 msgstr "Non preguntarme de novo"
 
-#: ../shell/main.c:315
-#, fuzzy
+#: ../shell/main.c:303
 msgid "Evolution Crash Detection"
-msgstr "Restauración do Evolution"
+msgstr "Detector de fallos do Evolution"
 
-#: ../shell/main.c:317
-#, fuzzy
+#: ../shell/main.c:305
 msgid "Ig_nore"
-msgstr "Ignorar"
+msgstr "Ig_norar"
 
-#: ../shell/main.c:332
+#: ../shell/main.c:320
 #, no-c-format
 msgid ""
 "Evolution appears to have exited unexpectedly the last time it was\n"
 "run.  As a precautionary measure, all preview panes will be hidden.\n"
 "You can restore the preview panes from the View menu.\n"
 msgstr ""
+"Parece que Evolution pechouse de forma inesperada a última vez que se\n"
+"executou. Como medida de precaución ocultaranse todos os paneis de vista\n"
+"previa. Pode restablecer os paneis de vista previa desde o menú Ver.\n"
 
-#: ../shell/main.c:343
-#, fuzzy
+#: ../shell/main.c:331
 msgid "_Do not show this message again"
-msgstr "Non mostrar esta mensaxe outra vez."
+msgstr "_Non mostrar esta mensaxe outra vez"
 
-#: ../shell/main.c:575
+#: ../shell/main.c:563
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando o compoñente especificado"
 
-#: ../shell/main.c:579
+#: ../shell/main.c:567
 msgid "Start in online mode"
 msgstr "Iniciar en modo con conexión"
 
-#: ../shell/main.c:582
+#: ../shell/main.c:570
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forzar o peche de todos os compoñentes do Evolution"
 
-#: ../shell/main.c:586
+#: ../shell/main.c:574
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forza a remigración desde o Evolution 1.4"
 
-#: ../shell/main.c:589
+#: ../shell/main.c:577
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a saída da depuración de todos os compoñentes a un ficheiro."
 
-#: ../shell/main.c:591
+#: ../shell/main.c:579
 msgid "Disable loading of any plugins."
 msgstr "Desactivar a carga de calquera plugin."
 
-#: ../shell/main.c:593
+#: ../shell/main.c:581
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr ""
+msgstr "Desactivar a vista previa do correo, contactos e tarefas."
 
-#: ../shell/main.c:678
+#: ../shell/main.c:666
 msgid "- The Evolution PIM and Email Client"
 msgstr "- O cliente de correo e PIM do Evolution"
 
-#: ../shell/main.c:706
+#: ../shell/main.c:694
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20265,7 +20831,7 @@ msgstr ""
 "Se escolle continuar, pode que non teña acceso a algúns dos seus datos "
 "antigos.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20276,7 +20842,7 @@ msgstr ""
 "\n"
 "Edite a configuración de confianza:"
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:151
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20286,7 +20852,7 @@ msgstr ""
 "certificado, entón confía na autoridade deste certificado a non ser que se "
 "indique outra cousa aquí"
 
-#: ../smime/gui/cert-trust-dialog.c:158
+#: ../smime/gui/cert-trust-dialog.c:155
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20344,7 +20910,7 @@ msgstr "Enderezo de correo electrónico"
 msgid "All CA certificate files"
 msgstr "Todos os ficheiros CA de certificación de correo"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:339
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualizador de certificados: %s"
@@ -20364,7 +20930,7 @@ msgid "Enter new password"
 msgstr "Introduza un contrasinal novo"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:115
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20373,7 +20939,7 @@ msgstr ""
 "Emitido a:\n"
 "  Asunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20382,7 +20948,7 @@ msgstr ""
 "Emitido por:\n"
 "  Asunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:168
 msgid "Select certificate"
 msgstr "Seleccione o certificado"
 
@@ -20570,7 +21136,7 @@ msgid "_Edit CA Trust"
 msgstr "_Editar confianza na CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:673
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "O certificado xa existe"
 
@@ -20885,7 +21451,7 @@ msgstr "Gardar os contactos do cartafol seleccionado como unha VCard."
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
@@ -20954,7 +21520,7 @@ msgstr "_Mover contacto a..."
 msgid "_Move Folder Contacts To"
 msgstr "_Mover cartafol de contactos a"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Novo"
 
@@ -21015,7 +21581,7 @@ msgid "Month"
 msgstr "Mes"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Seguinte"
 
@@ -21024,7 +21590,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Previsualiza o calendario que se vai imprimir"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Anterior"
 
@@ -21092,193 +21658,6 @@ msgstr "Semana laboral"
 msgid "_Open Appointment"
 msgstr "_Abrir cita"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Prema aquí para anexar un ficheiro"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Prema aquí para pechar a ventá actual"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Prema aquí para gardar a ventá actual"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Prema aquí para ver a axuda dispoñible"
-
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "Pechar"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Copiar o texto seleccionado ao portapapeis"
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Cortar o texto seleccionado para o portapapeis"
-
-#: ../ui/evolution-editor.xml.h:10
-msgid "I_nsert"
-msgstr "I_nserir"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Pegar texto desde o portapapeis"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Seleccionar todo o texto"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_Axuda"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Opcións"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Evento de día completo"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Evento de _día completo"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Clasificar como confidencial"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Clasificar como privado"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Clasificar como público"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr ""
-"Prema aquí para configurar ou desconfigurar as alarmas para este evento"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Inserir opcións avanzadas de envío"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Converter en evento recorrente"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Pú_blico"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Consultar información de dispoñibilidade para os participantes"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "Campo _rol"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "_Opcións de envío"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Mostrar hora como _ocupada"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "_Fuso horario"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Alterna entre se se mostra o campo Tipo de participante ou non"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Alterna entre se se mostra o campo RSVP ou non"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Alterna entre se se mostra o campo Rol ou non"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Alterna entre se se mostra o campo Estado ou non"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Alterna entre se se mostra ou non o campo Fuso horario"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr " Alterna entre se se mostran as categorías ou non"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Alterna entre se se ten un evento de día completo ou non"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Alterna entre se se mostran as horas como ocupadas ou non"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Alarmas"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Categorías"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Clasificación"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Confidencial"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Dispoñibilidade"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Privado"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Recorrencia"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "Campo de e_stado"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "Campo _tipo"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Cancelar a operación de correo actual"
@@ -21350,7 +21729,7 @@ msgstr ""
 
 #: ../ui/evolution-mail-global.xml.h:19
 msgid "View the debug console for log messages"
-msgstr ""
+msgstr "Ver a consola de depuración para as mensaxes de rexistro"
 
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
@@ -21361,14 +21740,12 @@ msgid "_Copy Folder To..."
 msgstr "_Copiar cartafol a..."
 
 #: ../ui/evolution-mail-global.xml.h:22
-#, fuzzy
 msgid "_Debug Logs"
-msgstr "Rexistro _web:"
+msgstr "_Rexistros de depuración"
 
 #: ../ui/evolution-mail-global.xml.h:23
-#, fuzzy
 msgid "_Download Messages for Offline Usage"
-msgstr "Descargar as mensaxes para o modo sen conexión"
+msgstr "_Descargar as mensaxes para o seu uso sen conexión"
 
 #: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
@@ -21456,9 +21833,8 @@ msgid "Mar_k All Messages as Read"
 msgstr "Ma_rcar todas as mensaxes como lidas"
 
 #: ../ui/evolution-mail-list.xml.h:17
-#, fuzzy
 msgid "Mark all messages in the folder as read"
-msgstr "Marcar todas as mensaxes nos subcartafoles como lidas?"
+msgstr "Marcar todas as mensaxes no cartafol como lidas?"
 
 #: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
@@ -21481,9 +21857,8 @@ msgid "Refresh the folder"
 msgstr "Actualizar o cartafol"
 
 #: ../ui/evolution-mail-list.xml.h:23
-#, fuzzy
 msgid "Select Message S_ubthread"
-msgstr "Seleccionar _fío de mensaxe"
+msgstr "Seleccionar o sub_fío da mensaxe"
 
 #: ../ui/evolution-mail-list.xml.h:24
 msgid "Select Message _Thread"
@@ -21503,9 +21878,8 @@ msgid "Select all messages in the same thread as the selected message"
 msgstr "Seleccionar todas as mensaxes do mesmo fío que a mensaxe seleccionada"
 
 #: ../ui/evolution-mail-list.xml.h:28
-#, fuzzy
 msgid "Select all replies to the currently selected message"
-msgstr "Seleccionar todas as mensaxes do mesmo fío que a mensaxe seleccionada"
+msgstr "Seleccionar todas as respostas á mensaxe actualmente seleccionada"
 
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "Select all visible messages"
@@ -21993,6 +22367,10 @@ msgstr "_Zoom"
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Pechar"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Barra de ferramentas principal"
@@ -22029,22 +22407,6 @@ msgstr "Ver a nota seleccionada"
 msgid "_Open Memo"
 msgstr "_Abrir nota"
 
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Prema para modificar ou ver os detalles do estado da tarefa"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Detalles do estado"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Fuso horario"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "Detalles do e_stado"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Copiar as tarefas seleccionadas"
@@ -22132,9 +22494,8 @@ msgid "Display window buttons with text only"
 msgstr "Mostrar os botóns da ventá só con texto"
 
 #: ../ui/evolution.xml.h:10
-#, fuzzy
 msgid "Evolution _FAQ"
-msgstr "Evolution"
+msgstr "_FAQ do Evolution"
 
 #: ../ui/evolution.xml.h:11
 msgid "Exit the program"
@@ -22153,7 +22514,6 @@ msgid "I_mport..."
 msgstr "I_mportar..."
 
 #: ../ui/evolution.xml.h:15
-#, fuzzy
 msgid "Icons _and Text"
 msgstr "Iconas _e texto"
 
@@ -22171,12 +22531,11 @@ msgstr "Nova _ventá"
 
 #: ../ui/evolution.xml.h:20
 msgid "Open the Frequently Asked Questions webpage"
-msgstr ""
+msgstr "Abrir a páxina web de preguntas máis frecuentes"
 
 #: ../ui/evolution.xml.h:21
-#, fuzzy
 msgid "Page Set_up..."
-msgstr "Configuración de páxina:"
+msgstr "Config_uración de páxina..."
 
 #: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
@@ -22231,7 +22590,6 @@ msgid "Toggle whether we are working offline."
 msgstr "Alternar entre se estamos traballando sen conexión ou non"
 
 #: ../ui/evolution.xml.h:36
-#, fuzzy
 msgid "Tool_bar Style"
 msgstr "Estilo da _barra de ferramentas"
 
@@ -22244,53 +22602,54 @@ msgid "View/Hide the Status Bar"
 msgstr "Ver/Ocultar a barra de estado"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "Traballar sen c_onexión"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Pechar ventá"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "Es_quecer contrasinais"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
-msgstr ""
+msgstr "_Preguntas máis frecuentes"
 
-#: ../ui/evolution.xml.h:46
-#, fuzzy
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "_Ocultar botóns"
 
-#: ../ui/evolution.xml.h:47
-#, fuzzy
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "Só _iconas"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Referencia rápida"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Saír"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "Aparencia do _selector"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "Opcións de _sincronización..."
 
-#: ../ui/evolution.xml.h:53
-#, fuzzy
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "Só _texto"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Ventá"
 
@@ -22367,11 +22726,11 @@ msgid "With _Status"
 msgstr "Con e_stado"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
 msgid "UTC"
 msgstr "UTC"
 
@@ -22389,7 +22748,7 @@ msgstr "Seleccionar un fuso horario"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Timezone drop-down combination box"
-msgstr ""
+msgstr "Caixa de combinación coas zonas horarias"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -22401,19 +22760,19 @@ msgstr ""
 "fuso horario.\n"
 "Use o botón dereito para reducir."
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr "Colección"
 
-#: ../widgets/menus/gal-define-views-dialog.c:360
+#: ../widgets/menus/gal-define-views-dialog.c:358
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definir visualizacións para %s"
 
+#: ../widgets/menus/gal-define-views-dialog.c:366
 #: ../widgets/menus/gal-define-views-dialog.c:368
-#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "Definir visualizacións"
 
@@ -22429,11 +22788,11 @@ msgstr "Definir visualizacións para \"%s\""
 msgid "Table"
 msgstr "Táboa"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "Instancia"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "Gardar visualización actual"
 
@@ -22485,11 +22844,11 @@ msgstr "Gardar a visualización personalizada actual"
 msgid "Create or edit views"
 msgstr "Crear ou editar visualizacións"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Factoría"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Definir visualizacións novas"
 
@@ -22505,44 +22864,17 @@ msgstr "Tipo de visualización"
 msgid "Type of view:"
 msgstr "Tipo de visualización:"
 
-#: ../widgets/misc/e-attachment-bar.c:103
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../widgets/misc/e-attachment-bar.c:109
-#, fuzzy, c-format
-msgid "%.1f KB"
-msgstr "%s KB"
-
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.1f MB"
-msgstr ""
-
-#: ../widgets/misc/e-attachment-bar.c:115
-#, c-format
-msgid "%.1f GB"
-msgstr ""
-
-#: ../widgets/misc/e-attachment-bar.c:1058
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Barra de anexos"
 
-#: ../widgets/misc/e-attachment-bar.c:1304
-#, fuzzy
-msgid "Recent Docu_ments"
-msgstr "porcentaxe feita"
-
-#: ../widgets/misc/e-attachment.c:296 ../widgets/misc/e-attachment.c:311
-#: ../widgets/misc/e-attachment.c:596 ../widgets/misc/e-attachment.c:613
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Non se pode anexar o ficheiro %s: %s"
 
-#: ../widgets/misc/e-attachment.c:304 ../widgets/misc/e-attachment.c:605
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Non se pode anexar o ficheiro %s: non é un ficheiro normal"
@@ -22564,11 +22896,11 @@ msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se mostre o anexo automaticamente"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1278
+#: ../widgets/misc/e-calendar-item.c:1273
 msgid "%B %Y"
 msgstr "%B de %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "Calendario mensual"
 
@@ -22614,29 +22946,29 @@ msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Largura mínima"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Largura mínima"
 
 #: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Espazamento"
 
-#: ../widgets/misc/e-cell-date-edit.c:292
+#: ../widgets/misc/e-cell-date-edit.c:291
 msgid "Now"
 msgstr "Agora"
 
-#: ../widgets/misc/e-cell-date-edit.c:849
+#: ../widgets/misc/e-cell-date-edit.c:848
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A data ten que ser introducida no formato: %s"
@@ -22740,56 +23072,55 @@ msgstr "Outro..."
 msgid "Ch_aracter Encoding"
 msgstr "Codificación dos car_acteres"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "Data e hora"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introducir a data"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "Prema este botón para mostrar un calendario"
 
-#: ../widgets/misc/e-dateedit.c:409
-#, fuzzy
+#: ../widgets/misc/e-dateedit.c:394
 msgid "Drop-down combination box to select time"
 msgstr "Caixa de combinación para seleccionar a hora"
 
-#: ../widgets/misc/e-dateedit.c:486
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "A_gora"
 
-#: ../widgets/misc/e-dateedit.c:492
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "_Hoxe"
 
-#: ../widgets/misc/e-dateedit.c:1657
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "O valor da data non é válido"
 
-#: ../widgets/misc/e-dateedit.c:1686
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "O valor da hora non é válido"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "Expandido"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "Se o expansor está expandido ou non"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "Texto da etiqueta do expansor"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "Usar subliñado"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -22797,31 +23128,31 @@ msgstr ""
 "Se se define, un subliñado no texto indica que o seguinte carácter debería "
 "usarse para a tecla rápida mnemónica"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "Espazo para pór entre a etiqueta e o fillo"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Widget etiqueta"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "Un widget para mostrar en lugar da etiqueta habitual do expansor"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3369
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
 msgid "Expander Size"
 msgstr "Tamaño do expansor"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3370
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
 msgid "Size of the expander arrow"
 msgstr "Tamaño da frecha do expansor"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Espazamento do indicador"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Espazamento ao redor da frecha do expansor"
 
@@ -22872,23 +23203,30 @@ msgstr "Cartafol actual"
 msgid "Current Message"
 msgstr "Mensaxe actual"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:167
 msgid "Choose Image"
 msgstr "Seleccione unha imaxe"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:625
 msgid "World Map"
 msgstr "Mapa do mundo"
 
-#: ../widgets/misc/e-map.c:629
-#, fuzzy
+#: ../widgets/misc/e-map.c:627
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
 msgstr ""
 "Widget con mapa interactivo baseado no rato para seleccionar o fuso horario. "
 "Os usuarios que só dispoñan de teclado poden, no seu lugar, seleccionar o "
-"fuso horario desde a caixa de combinación abaixo."
+"fuso horario desde a caixa de combinación de máis abaixo."
+
+#: ../widgets/misc/e-online-button.c:112
+msgid "Online"
+msgstr "En liña"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr "O estado do botón é conectado"
 
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
@@ -22914,63 +23252,61 @@ msgstr "Modelo de refluxo"
 msgid "Column width"
 msgstr "Largura de columna"
 
-#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
-#, fuzzy
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
-msgstr "_Buscar"
+msgstr "Buscar"
 
-#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
-#: ../widgets/misc/e-search-bar.c:484
-#, fuzzy
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
-msgstr "Prema aquí para anexar un ficheiro"
+msgstr "Prema aquí para cambiar o tipo de busca"
 
-#: ../widgets/misc/e-search-bar.c:615
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../widgets/misc/e-search-bar.c:621
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "_Buscar agora"
 
-#: ../widgets/misc/e-search-bar.c:622
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../widgets/misc/e-search-bar.c:877
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "ID de elemento"
 
-#: ../widgets/misc/e-search-bar.c:884 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Texto"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1018
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "Mos_trar: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "Busca_r: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1047
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " e_n "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Fila de cursor"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Columna de cursor"
@@ -22987,7 +23323,7 @@ msgstr "Modo de selección"
 msgid "Cursor Mode"
 msgstr "Modo do cursor"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:518
 msgid "When de_leted:"
 msgstr "Ao e_liminar:"
 
@@ -23011,10 +23347,6 @@ msgstr "<b>Seguimento de estado</b>"
 msgid "A_uto-delete sent item"
 msgstr "E_liminar automaticamente o elemento enviado"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Clasificación"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "_Crear un elemento enviado para o seguimento da información"
@@ -23121,14 +23453,14 @@ msgid "_When opened:"
 msgstr "_Ao abrir:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:303
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% terminada)"
@@ -23153,7 +23485,7 @@ msgstr "_Categorías dispoñibles:"
 msgid "categories"
 msgstr "categorías"
 
-#: ../widgets/table/e-cell-combo.c:170
+#: ../widgets/table/e-cell-combo.c:169
 msgid "popup list"
 msgstr "lista emerxente"
 
@@ -23236,9 +23568,8 @@ msgid "Clear All"
 msgstr "Limpar todo"
 
 #: ../widgets/table/e-table-config.glade.h:4
-#, fuzzy
 msgid "Clear _All"
-msgstr "Limpar todo"
+msgstr "_Limpar todo"
 
 #: ../widgets/table/e-table-config.glade.h:5
 #: ../widgets/table/e-table-header-item.c:1583
@@ -23258,19 +23589,16 @@ msgid "Move _Up"
 msgstr "Mover _arriba"
 
 #: ../widgets/table/e-table-config.glade.h:12
-#, fuzzy
 msgid "Show _field in View"
-msgstr "Mostrar o campo na visualización"
+msgstr "Mostrar o _campo na visualización"
 
 #: ../widgets/table/e-table-config.glade.h:13
-#, fuzzy
 msgid "Show field i_n View"
-msgstr "Mostrar o campo na visualización"
+msgstr "Mostrar o campo _na visualización"
 
 #: ../widgets/table/e-table-config.glade.h:14
-#, fuzzy
 msgid "Show field in _View"
-msgstr "Mostrar o campo na visualización"
+msgstr "Mostrar o campo na _visualización"
 
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "Sort"
@@ -23293,9 +23621,8 @@ msgid "_Group By..."
 msgstr "_Agrupar por..."
 
 #: ../widgets/table/e-table-config.glade.h:22
-#, fuzzy
 msgid "_Show field in View"
-msgstr "Mostrar o campo na visualización"
+msgstr "_Mostrar o campo na visualización"
 
 #: ../widgets/table/e-table-config.glade.h:23
 msgid "_Show these fields in order:"
@@ -23349,81 +23676,81 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d elemento)"
 msgstr[1] "%s (%d elementos)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Alternar as cores das filas"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
 #: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "Debuxar a grade horizontal"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
 #: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "Debuxar a grade vertical"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
 #: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "Debuxar o foco"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Modo do cursor"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Modelo de selección"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
 #: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "Límite de lonxitude"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
 #: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "Altura uniforme da fila"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "Conxelado"
 
@@ -23476,15 +23803,13 @@ msgid "Custo_mize Current View..."
 msgstr "Perso_nalizar a visualización actual..."
 
 #: ../widgets/table/e-table-header-item.c:1543
-#, fuzzy
 msgid "_Sort By"
-msgstr "Ordenar por"
+msgstr "_Ordenar por"
 
 #. Custom
 #: ../widgets/table/e-table-header-item.c:1561
-#, fuzzy
 msgid "_Custom"
-msgstr "Personalizado"
+msgstr "_Personalizado"
 
 #: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
@@ -23501,24 +23826,24 @@ msgstr "Ordenar a información"
 msgid "Tree"
 msgstr "Árbore"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Cabeceira da táboa"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Modelo da táboa"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Fila do cursor"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
 #: ../widgets/table/e-tree.c:3356
 msgid "Always search"
 msgstr "Buscar sempre"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Premer para engadir"
 
@@ -23638,175 +23963,42 @@ msgstr "Contexto MI"
 msgid "Handle Popup"
 msgstr "Tirador emerxente"
 
-#~ msgid "Permission Denied."
-#~ msgstr "Permiso denegado."
-
-#~ msgid "<b>Display</b>"
-#~ msgstr "<b>Monitor</b>"
-
-#~ msgid "<b>Server Information</b>"
-#~ msgstr "<b>Información do servidor</b>"
-
-#~ msgid "Unknown reason"
-#~ msgstr "Razón descoñecida"
-
-#~ msgid "Open File"
-#~ msgstr "Abrir ficheiro"
+#~ msgid "Mark all messages in this folder and subfolders as read?"
+#~ msgstr "Marcar todas as mensaxes no cartafol e subcartafoles como lidas?"
 
-#~ msgid "Cannot open file &quot;{0}&quot;."
-#~ msgstr "Non se pode abrir o ficheiro &quot;{0}&quot;."
+#~ msgid "Do you want the operation to be performed also in the subfolders?"
+#~ msgstr "Quere que se realice esta operación tamén nos subcartafoles?"
 
-#~ msgid "Attach original message"
-#~ msgstr "Anexar mensaxe orixinal"
+#~ msgid "Mark All Messages as Read"
+#~ msgstr "Marcar todas as mensaxes como lidas"
 
-#~ msgid "Do not quote original message"
-#~ msgstr "Non citar a mensaxe orixinal"
+#~ msgid "folder-display|%s (%u)"
+#~ msgstr "%s (%u)"
 
-#~ msgid "Quote original message"
-#~ msgstr "Citar a mensaxe orixinal"
+#~ msgid "_Save Message"
+#~ msgstr "_Gardar mensaxe"
 
-#~ msgid "Enter a name for this signature."
-#~ msgstr "Introduza un nome para esta sinatura."
-
-#~ msgid "Name:"
-#~ msgstr "Nome:"
+#~ msgid "Time interval, in seconds, how often upload store changes to server."
+#~ msgstr ""
+#~ "Intervalo de tempo, en segundos, para a frecuencia coa que subir os "
+#~ "cambios de almacenamento ao servidor."
 
 #~ msgid ""
-#~ "Are you sure you want to permanently remove all the deleted messages in "
-#~ "folder &quot;{0}&quot;?"
+#~ "Time interval, in seconds, how often upload store changes to server. The "
+#~ "actual value cannot be less than 30 seconds."
 #~ msgstr ""
-#~ "Está seguro de que quere eliminar permanentemente todas as mensaxes "
-#~ "eliminadas no cartafol &quot;{0}&quot;?"
-
-#~ msgid "Delete &quot;{0}&quot;?"
-#~ msgstr "Eliminar &quot;{0}&quot;?"
-
-#, fuzzy
-#~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-#~ msgstr "Non se pode engadir o cartafol de busca &quot;{0}&quot;."
+#~ "Intervalo de tempo, en segundos, para a frecuencia coa que subir os "
+#~ "cambios de almacenamento ao servidor. O valor actual non pode ser "
+#~ "inferior a 30 segundos."
 
-#, fuzzy
-#~ msgid "Only on _Current Folder"
-#~ msgstr "Cartafol actual"
-
-#, fuzzy
-#~ msgid "Enable attachment reminder plugin"
-#~ msgstr "Activar e desactivar plugins"
-
-#, fuzzy
-#~ msgid "Enable attachment reminder plugin."
-#~ msgstr "Activar e desactivar plugins"
-
-#, fuzzy
-#~ msgid "Remind _missing attachments"
-#~ msgstr "Gardando anexo"
-
-#, fuzzy
-#~ msgid "_Continue Editing"
-#~ msgstr "Continuar"
-
-#~ msgid "_Refresh:"
-#~ msgstr "_Actualizar:"
-
-#, fuzzy
-#~ msgid "Gives an option to print from the composer."
-#~ msgstr "Indica unha opción para imprimir o correo desde o editor"
-
-#~ msgid "Print Message"
-#~ msgstr "Imprimir mensaxe"
-
-#~ msgid "Prints the message"
-#~ msgstr "Imprimir a mensaxe"
-
-#~ msgid "Copy selection to clipboard"
-#~ msgstr "Copiar a selección no portapapeis"
-
-#~ msgid "Cut selection to clipboard"
-#~ msgstr "Cortar a selección para o portapapeis"
-
-#~ msgid "Paste from clipboard"
-#~ msgstr "Pegar desde o portapapeis"
-
-#~ msgid "Delete all but signature"
-#~ msgstr "Eliminar todo agás a sinatura"
-
-#~ msgid "For_mat"
-#~ msgstr "For_mato"
-
-#~ msgid "HT_ML"
-#~ msgstr "HT_ML"
-
-#~ msgid "Open a file"
-#~ msgstr "Abrir un ficheiro"
-
-#~ msgid "PGP Encrypt"
-#~ msgstr "Cifrar con PGP"
-
-#~ msgid "PGP Sign"
-#~ msgstr "Asinar con PGP"
-
-#~ msgid "S/MIME Encrypt"
-#~ msgstr "Cifrar con S/MIME"
-
-#~ msgid "S/MIME Sign"
-#~ msgstr "Sinatura S/MIME"
-
-#~ msgid "Save As"
-#~ msgstr "Gardar como"
-
-#~ msgid "Save Draft"
-#~ msgstr "Gardar borrador"
-
-#~ msgid "Save in folder..."
-#~ msgstr "Gardar no cartafol..."
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Gardar a mensaxe nun cartafol específico"
-
-#~ msgid "Send"
-#~ msgstr "Enviar"
-
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Enviar a mensaxe en formato HTML"
-
-#~ msgid "_Delete all"
-#~ msgstr "E_liminar todo"
-
-#~ msgid "_Open..."
-#~ msgstr "_Abrir..."
-
-#~ msgid "C_lose"
-#~ msgstr "P_echar"
-
-#~ msgid "H_TML"
-#~ msgstr "H_TML"
-
-#~ msgid "Save and _Close"
-#~ msgstr "Gardar e _Pechar"
-
-#~ msgid "Save the current file and close the window"
-#~ msgstr "Gardar o ficheiro actual e pechar a ventá"
-
-#~ msgid "Add folder to your list of subscribed folders"
-#~ msgstr "Engadir o cartafol á lista de cartafoles subscritos"
-
-#~ msgid "Refresh List"
-#~ msgstr "Actualizar lista"
-
-#~ msgid "Refresh List of Folders"
-#~ msgstr "Actualizar a lista de cartafoles"
-
-#~ msgid "Remove folder from your list of subscribed folders"
-#~ msgstr "Eliminar o cartafol da lista de cartafoles subscritos"
-
-#~ msgid "Subscribe"
-#~ msgstr "Subscribir"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "Eliminar subscrición"
+#~ msgid ""
+#~ "The selected folder does not have enough permissions to create the file"
+#~ msgstr ""
+#~ "Non ten suficientes permisos no cartafol seleccionado para crear o "
+#~ "ficheiro"
 
-#~ msgid "_Invert Selection"
-#~ msgstr "_Inverter selección"
+#~ msgid "A plugin that manages the Startup wizard."
+#~ msgstr "Un plugin que manipula o asistente de inicio."
 
-#~ msgid "TimeZone Combobox"
-#~ msgstr "Caixa de combinación para o fuso horario"
+#~ msgid "Startup wizard"
+#~ msgstr "Asistente de inicio"
diff --git a/po/gu.po b/po/gu.po
index 2a0a5e6885..a165e05d6d 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,19 +1,22 @@
 # translation of evolution.HEAD.gu.po to Gujarati
+#: ../shell/main.c:683
 # Ankit Patel <ankit644@yahoo.com>, 2005, 2006.
 # Ankit Patel <ankit@redhat.com>, 2007, 2008.
+# Sweta Kothari <swkothar@redhat.com>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-23 20:44+0000\n"
-"PO-Revision-Date: 2008-03-06 18:15+0530\n"
-"Last-Translator: Ankit Patel <ankit@redhat.com>\n"
-"Language-Team: Gujarati <fedora-trans-gu@redhat.com>\n"
+"POT-Creation-Date: 2008-08-04 19:00+0000\n"
+"PO-Revision-Date: 2008-08-05 17:03+0530\n"
+"Last-Translator: Sweta Kothari <swkothar@redhat.com>\n"
+"Language-Team: Gujarati\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n!=1);\n\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"\n"
 "\n"
 "\n"
 "\n"
@@ -88,21 +91,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution addressbook"
 msgstr "ઈવોલ્યુશન સરનામા પુસ્તિકા"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../a11y/addressbook/ea-minicard-view.c:32
 #: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "નવો સંપર્ક"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../a11y/addressbook/ea-minicard-view.c:33
 #: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "નવી સંપર્ક યાદી"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -110,7 +113,6 @@ msgstr[0] "વર્તમાન સરનામા પુસ્તિકા ફ
 msgstr[1] "વર્તમાન સરનામા પુસ્તિકા ફોલ્ડર %s ને %d કાર્ડો છે"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "ખોલો"
 
@@ -220,7 +222,7 @@ msgid "calendar view for one or more days"
 msgstr "એક અથવા વધુ દિવસો માટે કેલેન્ડર દેખાવ"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:758
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -231,20 +233,18 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:1363
-#: ../calendar/gui/e-day-view.c:2158
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/calendar-component.c:761
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
+#: ../calendar/gui/e-week-view-main-item.c:340
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:768
+#: ../calendar/gui/calendar-component.c:770
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -252,10 +252,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:797
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -265,17 +265,15 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:1367
-#: ../calendar/gui/e-day-view.c:2174
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/calendar-component.c:787
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
+#: ../calendar/gui/e-week-view-main-item.c:354
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:247
 #: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:772
+#: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "જીનોમ કેલેન્ડર"
 
@@ -387,32 +385,35 @@ msgstr "કેલેન્ડર: %s થી %s સુધીનું"
 msgid "evolution calendar item"
 msgstr "ઈવોલ્યુશન કેલેન્ડર વસ્તુ"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:39
 msgid "Combo Button"
 msgstr "કોમ્બો બટન"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:49
 msgid "Activate Default"
 msgstr "મૂળભુત સક્રિય કરો"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:51
 msgid "Popup Menu"
 msgstr "પોપઅપ મેનુ"
 
-#: ../a11y/widgets/ea-expander.c:40
+#: ../a11y/widgets/ea-expander.c:39
 msgid "Toggle Attachment Bar"
 msgstr "જોડાણ પટ્ટી બદલો"
 
-#: ../a11y/widgets/ea-expander.c:50
+#: ../a11y/widgets/ea-expander.c:49
 msgid "activate"
 msgstr "સક્રિય કરો"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
+#, fuzzy
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
-msgstr "'{0}' એ માત્ર-વાંચી શકાય તેવી સરનામા પુસ્તિકા સ્રોત છે. સંપર્કો દેખાવમાં બદલો અને સરનામા પુસ્તિકા પ્રકાશિત કરો કે જે સંપર્કો સ્વીકારી શકે."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr ""
+"'{0}' એ માત્ર-વાંચી શકાય તેવી સરનામા પુસ્તિકા સ્રોત છે. સંપર્કો દેખાવમાં બદલો અને સરનામા "
+"પુસ્તિકા પ્રકાશિત કરો કે જે સંપર્કો સ્વીકારી શકે."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -457,10 +458,11 @@ msgid "Could not remove addressbook."
 msgstr "સરનામાપોથી દૂર કરી શકાઈ નહિ."
 
 #: ../addressbook/addressbook.error.xml.h:11
+#, fuzzy
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
 "વર્તમાનમાં તમે ઈવોલ્યુશનમાંથી માત્ર જૂથપ્રમાણે સરનામા પુસ્તિકા જ વાપરી શકો છો. મહેરબાની "
 "કરીને અમુક અન્ય જૂથપ્રમાણે મેઈલ ક્લાઈન્ટ એકવાર વાપરો, તમારા જૂથપ્રમાણે આવૃત્તિ સંપર્કો મેળવવા "
@@ -484,7 +486,7 @@ msgstr "LDAP સર્વર સાથે સત્તાધિકરણ કર�
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
 msgid "Failed to delete contact"
 msgstr "સંપર્ક કાઢી નાંખવામાં નિષ્ફળ"
 
@@ -497,26 +499,22 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "પદ્ધતિની યોગ્ય જાણકારી સાથે LDAP સર્વર જવાબ આપતું નથી."
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "પરવાનગી નામંજૂર."
-
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "સર્વર આવૃત્તિ"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr "અમુક લક્ષણો તમારા વર્તમાન સર્વર સાથે યોગ્ય રીતે કામ કરશે નહિં"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "ઈવોલ્યુશન સરનામાપોથી અનિચ્છનીય રીતે બંધ થઈ ગઈ."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr "તમે પસંદ કરેલ ચિત્ર મોટું છે. શું તમે તેનું માપ બદલવા માંગો છો અને તેનો સંગ્રહ કરવા માંગો છો?"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:23
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -525,19 +523,19 @@ msgstr ""
 "આ LDAP સર્વર કદાચ LDAP ની જૂની આવૃત્તિ વાપરે છે; કે જે આ વિધેયોને આધાર આપતું નથી અથવા તે "
 "કદાચ રુપરેખાંકિત થયેલ નથી. તમારા સંચાલકને શોધ માટેના આધારો માટે પૂછો."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book will be removed permanently."
 msgstr "સરનામા પુસ્તિકા કાયમ માટે દૂર થઈ જશે."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This addressbook could not be opened."
 msgstr "સરનામાપોથી ખોલી શકાઈ નહિ."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "આ સરનામાપોથી સર્વર પાસે કોઈ શોધાયેલ આધારો નથી."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -545,27 +543,27 @@ msgstr ""
 "સરનામા પુસ્તિકા કદાચ પહોંચી શકાય નહિં અથવા સર્વર નામની જોડણી ખોટી હોઈ શકે અથવા "
 "તમારું નેટવર્ક જોડાણ ધીમું હોઈ શકે."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "આ સર્વર LDAPv3 પદ્ધતિની જાણકારીને આધાર આપતું નથી."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to open addressbook"
 msgstr "સરનામાપોથી ખોલવા માટે સમર્થ નથી"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "શોધ કરવામાં સમર્થ નથી."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "{0} સંગ્રહવામાં અસમર્થ."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "શું તમે તમારા ફેરફારો સંગ્રહવા માંગો છો?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -573,7 +571,7 @@ msgstr ""
 "તમે એક સરનામાપોથીમાંથી બીજી જગ્યાએ સંપર્ક ખસેડવાનો પ્રયત્ન કરી રહ્યા છો પરંતુ તે "
 "સ્રોતમાંથી દૂર કરી શકાતો નથી. શું તમે એની જગ્યાએ તેની નકલનો સંગ્રહ કરવા માંગો છો?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -582,6 +580,10 @@ msgstr ""
 "તમે બિનઆધારભૂત GroupWise સર્વર સાથે જોડાઈ રહ્યા છો અને ઈવોલ્યુશનમાં કદાચ સમસ્યાઓ "
 "મેળવશો. શ્રેષ્ઠ પરિણામો માટે સર્વર આધારભૂત આવૃત્તિમાં સુધારાવું જોઈએ"
 
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "આ સરનામું પુસ્તિકામાં સંપર્કો દૂર કરવા માટે તમને પરવાનગી નથી."
+
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
@@ -616,8 +618,8 @@ msgid "_Use as it is"
 msgstr "જેમ છે તેમ વાપરો (_U)"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -626,17 +628,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "મૂળભુત સીંક સરનામુ:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
 msgid "Could not load addressbook"
 msgstr "સરનામાપોથી લાવી શકાઈ નહિ"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "પાયલોટનો સરનામા કાર્યક્રમ બ્લોક વાંચી શકાયો નહિ"
 
@@ -658,10 +660,10 @@ msgstr "આપોઆપ સંપૂર્ણ અંહિ રુપરેખા
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
 msgstr "સંપર્કો"
 
@@ -670,8 +672,8 @@ msgid "Evolution Address Book"
 msgstr "ઈવોલ્યુશન સરનામા પુસ્તિકા"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
-msgstr "ઈવોલ્યુશન સરનામા પુસ્તિકા સરનામું પોપ-અપ"
+msgid "Evolution Address Book address popup"
+msgstr "ઈવોલ્યુશન સરનામા પુસ્તિકા સરનામું પોપઅપ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book address viewer"
@@ -702,11 +704,12 @@ msgstr "તમારા S/MIME પ્રમાણપત્રોની અંહ
 #: ../addressbook/gui/component/addressbook-component.c:144
 #: ../addressbook/gui/component/addressbook-migrate.c:499
 #: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:583 ../calendar/gui/migration.c:1096
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:307
-#: ../mail/mail-vfolder.c:216
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "આ કમ્પ્યુટરમાં"
 
@@ -719,28 +722,31 @@ msgstr "આ કમ્પ્યુટરમાં"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:591 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "ખાનગી"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "LDAP સર્વરો પર"
 
 #: ../addressbook/gui/component/addressbook-component.c:229
+msgctxt "New"
 msgid "_Contact"
-msgstr "સંપર્ક(_C)"
+msgstr "સંપર્ક (_C)"
 
 #: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "નવો સંપર્ક બનાવો"
 
 #: ../addressbook/gui/component/addressbook-component.c:237
+msgctxt "New"
 msgid "Contact _List"
 msgstr "સંપર્ક યાદી (_L)"
 
@@ -749,11 +755,12 @@ msgid "Create a new contact list"
 msgstr "નવી સંપર્ક યાદી બનાવો"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-config.c:1192
 msgid "New Address Book"
 msgstr "નવી સરનામા પોથી"
 
 #: ../addressbook/gui/component/addressbook-component.c:245
+msgctxt "New"
 msgid "Address _Book"
 msgstr "સરનામા પોથી (_B)"
 
@@ -765,72 +772,72 @@ msgstr "નવી સરનામાપોથી બનાવો"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "સરનામા પુસ્તિકા સુયોજનો અથવા ફોલ્ડરો સુધારવામાં નિષ્ફળ."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:315
 msgid "Base"
 msgstr "આધાર"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:516
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "પ્રકાર (_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:618
 msgid "Copy _book content locally for offline operation"
 msgstr "ઓફલાઈન ક્રિયાઓ માટે બુકના સમાવિષ્ટો સ્થાનીકપણે નકલ કરો (_b)"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/addressbook-config.c:967
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2343
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../calendar/gui/dialogs/calendar-setup.c:388
+#: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "સામાન્ય"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "સરનામા પોથી"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:972
 msgid "Server Information"
 msgstr "સર્વર જાણકારી"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:974
 msgid "Authentication"
 msgstr "સત્તાધિકરણ"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:977
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "વિગતો"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../addressbook/gui/component/addressbook-config.c:978
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "શોધી રહ્યા છીએ"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:980
 msgid "Downloading"
 msgstr "ડાઉનલોડ કરી રહ્યા છીએ"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1190
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "સરનામાપોથીના ગુણધર્મો"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "રુપાંતરિત કરી રહ્યા છીએ..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s' ને રુપાંતરિત કરી રહ્યા છીએ:"
@@ -885,48 +892,48 @@ msgstr ""
 "જ્યારે ઈવોલ્યુશન તમારા પાયલોટ સીંક માહિતીનું રોનું રુપાંતર કરે ત્યારે મહેરબાની કરીને શાંતિ "
 "દાખવો..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
+#: ../addressbook/gui/component/addressbook-view.c:430
 #: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" ફોલ્ડરને આમાં નામ બદલો:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../addressbook/gui/component/addressbook-view.c:433
 #: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "ફોલ્ડરનું નામ બદલો"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
+#: ../addressbook/gui/component/addressbook-view.c:438
 #: ../mail/em-folder-utils.c:511
 msgid "Folder names cannot contain '/'"
 msgstr "ફોલ્ડર નામો '/' સમાવી શકતા નથી"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "_New Address Book"
 msgstr "નવી સરનામા પુસ્તિકા (_N)"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:951
 msgid "Save As vCard..."
 msgstr "vCard તરીકે સંગ્રહો..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1385
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:939
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1346
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/calendar-component.c:620
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "કાઢી નાંખો (_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:957
 msgid "_Properties..."
 msgstr "ગુણધર્મો (_P)..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "સંપર્ક સ્રોત પસંદ કરનાર"
 
@@ -935,19 +942,19 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "અજાણી રીતે LDAP સર્વર વાપરી રહ્યા છીએ"
 
 #: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "સત્તાધિકરણ કરવામાં નિષ્ફળ.\n"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s (વપરાશકર્તા %s) માટે પાસવર્ડ દાખલ કરો"
 
 #: ../addressbook/gui/component/addressbook.c:215
 #: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "પાસવર્ડ દાખલ કરો"
@@ -1022,103 +1029,95 @@ msgid "<b>Authentication</b>"
 msgstr "<b>સત્તાધિકરણ</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>ડિસ્પ્લે</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>ડાઉનલોડ કરી રહ્યા છીએ</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>શોધી રહ્યા છીએ</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>સર્વરની જાણકારી</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>પ્રકાર:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "સરનામા પોથી ઉમેરો"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:777
+#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../mail/em-account-editor.c:761
 msgid "Always"
 msgstr "હંમેશા"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "અનામિક રીતે"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Basic"
 msgstr "આધાર"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Distinguished name"
 msgstr "અલગ તારવેલ નામ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Email address"
 msgstr "ઈ-મેઈલ સરનામુ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Evolution will use this email address to authenticate you with the server."
 msgstr "ઈવોલ્યુશન આ ઈ-મેઈલ સરનામુ તમને સર્વર સાથે સત્તાધિકરણ કરવામાં વાપરશે."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Find Possible Search Bases"
 msgstr "શક્ય શોધ આધારો શોધો"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Lo_gin:"
 msgstr "પ્રવેશ (_g):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "ક્યારેય નહિ"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:304
+#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "કોઈ એનક્રિપ્શન નથી"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "One"
 msgstr "એક"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:312
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL એનક્રિપ્શન"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search Filter"
 msgstr "શોધ ગાળક"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "શોધનો આધાર (_b):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search _filter:"
 msgstr "શોધ ગાળક (_f):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search filter"
 msgstr "શોધ ગાળક"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1127,7 +1126,7 @@ msgstr ""
 "શોધ ગાળક એ શોધવા માટેનો ઓબ્જેક્ટનો પ્રકાર છે, જ્યારે શોધ કરી રહ્યા હોઈએ ત્યારે. જો આ "
 "સુધારાયેલ નહિં હોય, તો મૂળભૂત રીતે \"વ્યક્તિ\" પ્રકારના ઓબ્જેક્ટ ક્લાસ પર શોધ થશે."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1135,7 +1134,7 @@ msgstr ""
 "આ વિકલ્પ પસંદ કરવાનું એટલે કે ઈવોલ્યુશન માત્ર તમારા LDAP સર્વર સાથે જોડાશે જો તમારું LDAP "
 "સર્વર SSL ને આધાર આપે."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1143,7 +1142,7 @@ msgstr ""
 "આ વિકલ્પને પસંદ કરવાનું એટલે કે ઈવોલ્યુશન એ માત્ર તમારા LDAP સર્વર સાથે જોડાશે જો તમારું "
 "LDAP સર્વર એ TLS ને આધાર આપે."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1153,23 +1152,23 @@ msgstr ""
 "અર્થ એ થાય કે તમારું જોડાણ અસુરક્ષિત રહેશે, અને તમે સુરક્ષા ભંગાણો નબળા પાડવા માટે જવાબદા "
 "હશો."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Sub"
 msgstr "ઉપ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "આધારભૂત શોધના આધારો"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:308
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS એનક્રિપ્શન"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -1178,7 +1177,7 @@ msgstr ""
 "શોધ આધાર એ પ્રવેશનું વિસ્તૃત નામ (DN) છે કે જ્યાં તમારી શોધો શરૂ થશે. જો તમે આને ખાલી છોડી "
 "મૂકો, તો શોધ ડિરેક્ટરી વૃક્ષના મૂળથી શરૂ થશે."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -1189,13 +1188,13 @@ msgstr ""
 "તમારી શોધના આધારની નીચેના બધા પ્રવેશો માટે શોધે છે. \"one\" ની શોધની હદ તમારી "
 "શોધના આધારની નીચેના એક સ્તરના પ્રવેશ સુધી જ શોધે છે."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "આ તમારા ldap સર્વરનું પૂરું નામ છે. ઉદાહરણ તરીકે, \"ldap.mycompany.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1203,7 +1202,7 @@ msgstr ""
 "આ ડાઉનલોડ કરવા માટેના પ્રવેશોની મહત્તમ સંખ્યા છે. આ સંખ્યાને ખૂબ મોટી સંખ્યા સાથે સુયોજિત "
 "કરવાનું તમારી સરનામાપોથીને ધીમી કરી દેશે."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1212,7 +1211,7 @@ msgstr ""
 "આ પદ્ધતિ તમારું સત્તાધિકરણ કરવા માટે ઈવોલ્યુશન વાપરશે.  નોંધ કરો કે આને \"ઈમેઈલ સરનામું\" "
 "માં સુયોજિત કરવાને તમારા ldap સર્વર સાથેના અનામિક વપરાશની જરૂર છે."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1220,7 +1219,7 @@ msgstr ""
 "આ એ સર્વરનું નામ છે કે જે તમારા ઈવોલ્યુશન ફોલ્ડરની યાદીમાં દેખાશે. એ માત્ર પ્રદર્શન કરવા "
 "માટે જ છે. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -1230,75 +1229,75 @@ msgstr ""
 "યાદી પૂરી પાડવામાં આવેલ છે. તમારા સિસ્ટમ સંચાલકને પૂછો કે તમારા માટે કયો પોર્ટ સ્પષ્ટ "
 "કરાયેલ છે."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "અલગ તારવેલ નામ (DN) વાપરી રહ્યા છીએ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "ઈ-મેઈલ સરનામુ વાપરી રહ્યા છીએ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Whenever Possible"
 msgstr "જ્યારે પણ શક્ય હોય ત્યારે"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Address Book"
 msgstr "સરનામાપોથી ઉમેરો (_A)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "ડાઉનલોડની મર્યાદા (_D):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Find Possible Search Bases"
 msgstr "શક્ય શોધના આધારો શોધો (_F)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Login method:"
 msgstr "પ્રવેશ પદ્ધતિ (_L):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "નામ (_N):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Port:"
 msgstr "પોર્ટ (_P):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "_Search scope:"
 msgstr "શોધની હદ (_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "સર્વર (_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Timeout:"
 msgstr "સમય સમાપ્ત (_T):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Use secure connection:"
 msgstr "સુરક્ષિત જોડાણ વાપરો (_U):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "cards"
 msgstr "પત્રો"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:401
 msgid "minutes"
 msgstr "મિનિટો"
 
@@ -1339,7 +1338,7 @@ msgid "<b>Work</b>"
 msgstr "<b>કાર્ય</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1351,16 +1350,16 @@ msgid "Ca_tegories..."
 msgstr "વર્ગો (_t)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "સંપર્ક"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
 msgid "Contact Editor"
 msgstr "સંપર્ક સંપાદક"
 
@@ -1373,7 +1372,7 @@ msgid "Image"
 msgstr "ઈમેજ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN સંદેશાવાહક"
 
@@ -1386,7 +1385,7 @@ msgid "Nic_kname:"
 msgstr "લાડકુ નામ (_k):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "નોવેલ જૂથ પ્રમાણે"
 
@@ -1400,11 +1399,11 @@ msgstr "ટેલિફોન"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "કાર્ય"
 
@@ -1426,7 +1425,7 @@ msgid "_Birthday:"
 msgstr "જન્મ દિવસ (_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
@@ -1516,1119 +1515,1121 @@ msgstr "ક્યાં (_W):"
 msgid "_Zip/Postal Code:"
 msgstr "ઝીપ/પોસ્ટલ કોડ (_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "સરનામું"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "ફેરફાર કરી શકાય તેવું"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "United States"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "અફઘાનિસ્તાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "અલ્બેનિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "અલ્જેરિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "અમેરિકન સમોઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "અન્ડોરા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "અન્ગોલા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "અન્ગ્યુલા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "એન્ટર્કટિકા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Antigua And Barbuda"
 msgstr "એન્ટીગ્યુઆ અને બર્બ્યુડાુડા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "આર્જેન્ટિના"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "અર્મેનિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "અરુબા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "ઓસ્ટ્રેલિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "ઓસ્ટ્રિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "અઝર્બેઈજાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "બાહામસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "બહેરિન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "બાંગ્લાદેશ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "બાર્બાડોસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "બેલરુસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "બેલ્જિયમ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "બેલાઈઝ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "બેનીન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "બેરમ્યુડા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "ભુતાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "બોલીવિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bosnia And Herzegowina"
 msgstr "બોસ્નીયા અને હર્ઝેગોવિના"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "બોટ્સવાના"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "બાઉવેટ ટાપુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "બ્રાઝિલ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "British Indian Ocean Territory"
 msgstr "બ્રિટિશ ભારતીય ઓસન ફરવાનું સ્થળ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "બ્રુનેઈ દારુસલામ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "બલ્ગેરિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "બર્કિના ફાસો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "બુરુન્દી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "કમ્બોડિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "કેમેરુન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "કેનેડા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "કેપ વર્ડે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "કેમેન ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Central African Republic"
 msgstr "સેન્ટ્રલ આફ્રિકન રીપબ્લીક"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "ચાડ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "ચાઈલ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "ચીન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "ક્રિસમસ ટાપુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Cocos (Keeling) Islands"
 msgstr "કોકોસ (કીલીંગ) ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "કોલમ્બિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "કોમોરોસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "કોન્ગો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Congo, The Democratic Republic Of The"
 msgstr "કોન્ગો, નું સામ્યવાદી સ્વતંત્ર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "કુક ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "કોસ્ટા રીકા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "કોટ ડીવોર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "ક્રોટીઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "ક્યુબા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "સાયપ્રસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "ચેક સ્વતંત્ર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "ડેન્માર્ક"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "ડીજીબોટી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "ડોમિનીકા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "ડોમિનીકન સ્વતંત્ર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "ઈક્વેડર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "ઈજીપ્ત"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "El સેલ્વેડોર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "ઈક્વીટોરીયલ જીનેઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "એરીટ્રીઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "ઈસ્ટોનિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "ઈથીઓપિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "ફોલ્કલેન્ડ ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "ફેરો ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "ફીજી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "ફિનલેન્ડ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "ફ્રાંસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "ફ્રેંચ જીનેઆના"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "ફ્રેંચ પોલિનેસિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "French Southern Territories"
 msgstr "ફરવાના ફ્રેંચ દક્ષિણિ સ્થળો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "ગેબન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "ગામ્બિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "જ્યોર્જિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "જર્મની"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "ઘાના"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "ગીબ્રાલ્ટાર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "ગ્રીસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "ગ્રીનલેન્ડ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "ગ્રીનાડા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "ગ્યુએડીલોપ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "ગૌમ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "ગ્યુએટમાલા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "જ્યુર્નસે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "જ્યુએનિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guinea-Bissau"
 msgstr "જ્યુએનિયા-બિસાઉ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "ગાયાના"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "હાઈટી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Heard And McDonald Islands"
 msgstr "હર્ડ અને મેકડોનલ ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "હોલી સમુદ્ર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "હોન્ડુરાસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "હોંગ કોંગ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "હંગરી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "ટાપુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "ભારત"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "ઈન્ડોનેશિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "ઈરાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "ઈરાક"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "આર્યલેન્ડ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Isle of Man"
 msgstr "ઈસલ ઓફ મેન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "ઈઝરાયલ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "ઈટાલી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "જમાઈકા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "જાપાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "જર્સી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "જોર્ડન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "કઝાકિસ્તાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "કેન્યા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "કિરીબાટી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "કોરીયા, સામ્યવાદી લોકોની સ્વતંત્રતા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Korea, Republic Of"
 msgstr "કોરીયા, નું સ્વતંત્ર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "કુવૈત"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "કેર્ગીઝ્તાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "લાઓસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "લાટવિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "લેબનોન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "લેસોથો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "લાઈબેરીયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "લિબ્યા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "લીચટેન્સ્ટેન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "લીથુઆનિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "લુક્ઝેમ્બર્ગ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "મેકાઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "મેકેડોનિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "મડાગાસ્કાર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "માલાવી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "મલેશિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "માલદીવ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "માલી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "માલ્ટા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "માર્શલ ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "માર્ટીનીક"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "મૌરીટાનિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "મોરેશિયસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "મેયોટે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "મેક્સિકો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "માઈક્રોનેશિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Moldova, Republic Of"
 msgstr "માેલડોવા, નું સ્વતંત્ર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "મોનેકો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "મોંગોલિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "મોન્ટસેરાટ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "મોરોક્કો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "મોઝામ્બિક"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "મ્યાનમાર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "નામિબિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "નૌરુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "નેપાળ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "નેધરલેન્ડઝ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "નેધરલેન્ડઝ એન્ટાઈલીસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "નવુ કેલેડોનિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "ન્યુઝીલેન્ડ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "નાઈકારાગુઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "નાઈજર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "નાઈજીરીયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "નીયુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "નોર્ફોલ્ક ટાપુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Northern Mariana Islands"
 msgstr "ઉત્તરી મારીઆના ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "નોર્વે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "ઓમાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "પાકિસ્તાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "પાલાઉ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "ફરવાનું સ્થળ પેલેસ્ટિયન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "પનામા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Papua New Guinea"
 msgstr "પપુઆ ન્યુ જીનેઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "પેરાગ્યુઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "પેરુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "ફિલિપાઈન્સ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "પિટકેર્ન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "પોલેન્ડ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "પોર્ટુગલ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "પ્યુએર્ટો રેકો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "કતાર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "રીયુનિયન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "રોમાનિઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "રશિયાઈ ફીડરેશન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "ર્વાન્ડા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Kitts And Nevis"
 msgstr "કીટ્સ અને નેવીસ સંત"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "સંત લ્યુસીઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Saint Vincent And The Grenadines"
 msgstr "સંત વિન્સન્ટ અને ગ્રેના ડાઈન્સ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "સમાેઆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "સન મારીનો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Sao Tome And Principe"
 msgstr "સાઓ ટોમ અને પ્રિન્સાઈપ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "સાઉદી અરેબિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "સિનેગલ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Serbia And Montenegro"
 msgstr "સર્બિયા અને મોન્ટેનેગ્રો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "સીચેલેસ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "સીરા લીઓન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "સિંગાપોર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "સ્લોવેકિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "સ્લોવેનિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "સોલોમન ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "સોમાલિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "દક્ષિણ આફ્રિકા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "દક્ષિણ જ્યોર્જિયા અને દક્ષિણ સેન્ડવીચ ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "સ્પેન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "શ્રીલંકા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "સંત હેલેના"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "સંત પીએરા અને મિકેલન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "સુદાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "સુરીનામ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "સ્વાલબર્ડ અને જન મેયેન ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "સ્વાઝીલેન્ડ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "સ્વીડન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "સ્વીઝ્ઝરલેન્ડ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "સીરીયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "તાઈવાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "તજીકિસ્તાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tanzania, United Republic Of"
 msgstr "તાન્ઝાનિયા, યુનાઈટેડનું સ્વતંત્ર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "થાઈલેન્ડ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "ટાઈમોર-લેસ્તે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "ટોગો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "તોકેલાઉ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "ટોન્ગા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Trinidad And Tobago"
 msgstr "ટ્રીનીદાદ અને ટોબેગો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "તનીસિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "તુર્કી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "તુર્કમેનિસ્તાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Turks And Caicos Islands"
 msgstr "તુર્કો અને કેઈકોસ ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "તુવાલુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "યુગાન્ડા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "યુક્રેઈની"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Arab Emirates"
 msgstr "યુનાઈટેડ આરબ અમીરાતો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "યુનાઈટેડ કિંગડમ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "United States Minor Outlying Islands"
 msgstr "યુનાઈટેડ સ્ટેટ્સ માઈનોર આઉટલાઈંગ ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "ઉરુગ્વે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "ઉઝ્બેકિસ્તાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "વેનુએટુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "વેનેઝુએલા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "વયેટનામ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, British"
 msgstr "વર્જિન ટાપુઓ, બ્રિટિશ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Virgin Islands, U.S."
 msgstr "વર્જિન ટાપુઓ, U.S."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Wallis And Futuna Islands"
 msgstr "વેલિસ અને ફ્યુટુના ટાપુઓ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "પશ્ચિમિ સહારા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "યેમાન"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "ઝામ્બિયા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "ઝિમ્બાબ્વે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../plugins/exchange-operations/exchange-delegates.c:952
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
+#: ../plugins/plugin-manager/plugin-manager.c:41
+#: ../plugins/save-attachments/save-attachments.c:350
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "નામ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "AOL Instant Messenger"
 msgstr "AOL તુરંત સંદેશાવાહક"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "જેબર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Yahoo Messenger"
 msgstr "યાહુ મેસેન્જર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu સંદેશાવાહક"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
 msgid "Service"
 msgstr "સેવા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "જગ્યા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "વપરાશકર્તાનું નામ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "ઘર"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "બીજા"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "યાહુ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "જૂથ પ્રમાણે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Source Book"
 msgstr "સ્રોત ચોપડી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Target Book"
 msgstr "લક્ષ્ય ચોપડી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
 msgid "Is New Contact"
 msgstr "નવો સંપર્ક છે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Writable Fields"
 msgstr "લખી શકાય તેવા ક્ષેત્રો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Required Fields"
 msgstr "જરૂરી ક્ષેત્રો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "બદલાયેલ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "સંપર્ક સંપાદક - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "Please select an image for this contact"
 msgstr "મહેરબાની કરીને આ સંપર્ક માટે ચિત્ર પસંદ કરો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "_No image"
 msgstr "કોઈ ચિત્ર નથી (_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2636,47 +2637,47 @@ msgstr ""
 "સંપર્ક માહિતી અયોગ્ય છે:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' નું બંધારણ અયોગ્ય છે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' નું બંધારણ અયોગ્ય છે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ખાલી છે"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
 msgid "Invalid contact."
 msgstr "અયોગ્ય સંપર્ક."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "સંપર્ક ઝડપી-ઉમેરો"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "સંપૂર્ણ ફેરફાર કરો (_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "પુરૂં નામ (_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "ઈમેઈલ (_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "સરનામા પુસ્તિકા પસંદ કરો (_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2685,7 +2686,7 @@ msgstr ""
 "શું તમે ખરેખર સંપર્ક યાદી (%s)\n"
 "કાઢી નાંખવા માંગો છો?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2693,7 +2694,7 @@ msgstr ""
 "શું તમે ખરેખર આ સંપર્ક યાદીઓ\n"
 "દૂર કરવા માંગો છો?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2702,7 +2703,7 @@ msgstr ""
 "શું તમે ખરેખર સંપર્ક (%s)\n"
 "કાઢી નાંખવા માંગો છો?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2844,12 +2845,17 @@ msgstr "નીચેની યાદીમાંથી સંપર્ક ખે
 msgid "Contact List Members"
 msgstr "સંપર્ક સભ્યોની યાદી"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+msgid "_Members"
+msgstr "સભ્યો (_M)"
+
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
 #: ../addressbook/gui/widgets/e-addressbook-model.c:298
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:217
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "ચોપડી"
 
@@ -2857,10 +2863,6 @@ msgstr "ચોપડી"
 msgid "Is New List"
 msgstr "એ નવી યાદી છે"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "સભ્યો (_M)"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "બદલાયેલ સંપર્ક:"
@@ -2898,40 +2900,40 @@ msgstr ""
 "આ સંપર્કનું નામ અથવા ઈ-મેઈલ સરનામું પહેલાથી જ આ\n"
 "ફોલ્ડરમાં હાજર છે. શું તમે એને કોઈપણ રીતે ઉમેરવા માંગો છો?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "સંપર્ક ભેગા કરો"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "ભેગું કરો (_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "સંપર્ક ભેગા કરો"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:860
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "ઈ-મેઈલ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
-#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "કોઈ ક્ષેત્ર સમાવે છેે"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "ઈ-મેઈલ આની સાથે શરુ થાય છે"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "નામ આની સાથે શરુ થાય છે"
+msgid "Name contains"
+msgstr "નામ સમાવે છે"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2946,9 +2948,9 @@ msgstr[1] "%d સંપર્કો"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "પ્રશ્ન"
 
@@ -2959,9 +2961,9 @@ msgstr "પુસ્તક દેખાવ મેળવવામાં ભૂલ
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../widgets/text/e-text.c:3551
+#: ../widgets/table/e-table.c:3353
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "મોડેલ"
 
@@ -2969,107 +2971,109 @@ msgstr "મોડેલ"
 msgid "Error modifying card"
 msgstr "કાર્ડ સુધારતી વખતે ભૂલ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+msgid "Name begins with"
+msgstr "નામ આની સાથે શરુ થાય છે"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "સ્રોત"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../calendar/gui/e-meeting-list-view.c:508
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "પ્રકાર"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
 msgid "Save as vCard..."
 msgstr "vCard તરીકે સંગ્રહો..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1363
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:922
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1574
+#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "ખોલો (_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "નવો સંપર્ક (_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "નવી સંપર્ક યાદી (_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "vCard તરીકે સંગ્રહો (_S)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "સંપર્ક આગળ ધપાવો (_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "સંપર્કો આગળ ધપાવો (_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "સંપર્કને સંદેશો મોકલો (_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "યાદીને સંદેશો મોકલો (_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "સંપર્કોને સંદેશો મોકલો (_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "છાપો (_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "સરનામા પુસ્તિકામાં નકલ કરો (_y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "સરનામા પુસ્તિકામાં ખસેડો (_v)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "કાપો (_t)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1371
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:930
-#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:1013
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "નકલ કરો (_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "ચોંટાડો (_a)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
-#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
-#: ../calendar/gui/cal-search-bar.c:681
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
+#: ../calendar/gui/cal-search-bar.c:680
 msgid "Any Category"
 msgstr "કોઈપણ વર્ગ"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "બીજી ભૂલ"
 
@@ -3104,7 +3108,7 @@ msgstr "ગાડીનો ફોન"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:169
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3205,9 +3209,9 @@ msgid "Radio"
 msgstr "રેડિયો"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:713
 msgid "Role"
 msgstr "ભૂમિકા"
 
@@ -3243,38 +3247,38 @@ msgid "Web Site"
 msgstr "વેબ સાઈટ"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
 #: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
+#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "પહોળાઈ"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "ઊંચાઈ"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "નો ફોકસ"
 
@@ -3294,11 +3298,21 @@ msgstr "લખાણ મોડેલ"
 msgid "Max field name length"
 msgstr "ક્ષેત્રના નામની મહત્તમ લંબાઈ"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
 msgid "Column Width"
 msgstr "સ્તંભની પહોળાઈ"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"સંપર્કો માટે શોધી રહ્યા છે..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3312,7 +3326,7 @@ msgstr ""
 "\n"
 "અથવા નવો સંપર્ક બનાવવા માટે બવડું-ક્લિક કરો."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3326,7 +3340,7 @@ msgstr ""
 "\n"
 "નવો સંપર્ક બનાવવા માટે અંહિ બે વાર ક્લિક કરો."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3336,7 +3350,7 @@ msgstr ""
 "\n"
 "સંપર્ક માટે શોધો."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3346,40 +3360,41 @@ msgstr ""
 "\n"
 "આ દેખાવમાં જોવા માટે કોઈ વસ્તુઓ નથી."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "એડેપ્ટર"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "કામનો ઈ-મેઈલ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "ઘરનો ઈમેઈલ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "અન્ય ઈમેઈલ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "પસંદ કરેલ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "ને કર્સર"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
 msgid "_Open Link in Browser"
 msgstr "કડીને બ્રાઉઝરમાં ખોલો (_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "કડીની જગ્યાની નકલ કરો (_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
 msgid "_Send New Message To..."
 msgstr "ના પ્રતિ નવો સંદેશો મોકલો (_S)..."
 
@@ -3401,7 +3416,7 @@ msgid "map"
 msgstr "નકશો"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "સભ્યોની યાદી"
 
@@ -3422,15 +3437,15 @@ msgid "Video Chat"
 msgstr "વિડીયો સંવાદ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/gnome-cal.c:2376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:574
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
 #: ../plugins/hula-account-setup/camel-hula-listener.c:378
 #: ../plugins/hula-account-setup/camel-hula-listener.c:407
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -3439,8 +3454,7 @@ msgstr "કેલેન્ડર"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "મુક્ત/વ્યસ્ત"
 
@@ -3462,125 +3476,127 @@ msgid "Web Log"
 msgstr "વેબ લોગ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2327
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "જન્મદિવસ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2328
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "વર્ષગાંઠ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "કામનું શીર્ષક"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "ઘર પાનું"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "બ્લોગ"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "સફળતા"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "પાશ્વ ભાગ વ્યસ્ત છે"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "રીપોઝીટરી ઓફલાઈન"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "સરનામા પોથી અસ્તિત્વમાં નથી"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "No Self Contact defined"
 msgstr "કોઈ પોતાનો સંપર્ક વ્યાખ્યાયિત નથી"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "પરવાનગી નથી"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "સંપર્ક મળ્યો નથી"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "સંપર્ક ID પહેલાથી જ હાજર છે"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "પ્રોટોકોલને આધાર નથી"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "નકારાઈ ગયું"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "નકારી શકાયું નહિં"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 #: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "સત્તાધિકરણ નિષ્ફળ"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "સત્તાધિકરણ જરુરી છે"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS ઉપલબ્ધ નથી"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "આવો કોઈ સ્રોત નથી"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "ઓફલાઈન સ્થિતિમાં ઉપલબ્ધ નથી"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "અયોગ્ય સર્વર આવૃત્તિ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#: ../addressbook/gui/widgets/eab-gui-util.c:101
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3590,7 +3606,7 @@ msgstr ""
 "માટે ચિહ્નિત નથી અથવા ઓફલાઈન વપરાશ માટે હજુ સુધી ડાઉનલોડ થયેલ નથી. મહેરબાની કરીને "
 "સરનામા પુસ્તિકાના સમાવિષ્ટો ડાઉનલોડ કરવા માટે તેને એકવાર ઓનલાઈન સ્થિતિમાં લાવો"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3599,7 +3615,7 @@ msgstr ""
 "અમે આ સરનામાપોથી ખોલવા માટે સમર્થ ન હતા.  મહેરબાની કરીને ચકાસો કે પથ છે %s અસ્તિત્વમાં "
 "છે અને તમારી પાસે તેને ચલાવવાની પરવાનગી છે કે નહિં."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3607,7 +3623,7 @@ msgstr ""
 "અમે આ સરનામાપોથી ખોલવા માટે સમર્થ નથી. એનો અર્થ એ થાય કે તમે ખોટી URI દાખલ કરી હશે, "
 "અથવા LDAP સર્વર પહોંચી શકાય એમ નથી."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3616,7 +3632,7 @@ msgstr ""
 "ઈવોલ્યુશનની આવૃત્તિ પાસે તેમાં કમ્પાઈલ થયો હોય તેવો LDAP નો આધાર નથી. જો તમે LDAP "
 "ઈવોલ્યુશનમાં વાપરવા માંગતા હોય, તો તમારે LDAP-સક્રિય ઈવોલ્યુશન પેકેજ સ્થાપિત કરવું જ જોઈએ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3624,7 +3640,7 @@ msgstr ""
 "અમે આ સરનામાપોથી ખોલવા અસમર્થ છે. એનો અર્થ એ થાય કે તમેખોટી URI દાખલ કરી છે, અથવા "
 "સર્વર પહોંચી શકાય એમ નથી."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3636,7 +3652,7 @@ msgstr ""
 "મહેરબાની કરીને ખાતરી કરો કે તમારી શોધ વધુ ચોક્કસ અથવા ડિરેક્ટરી \n"
 "સર્વરમાં પરિણામ વધારે આ સરનામાપોથી માટે."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3648,45 +3664,45 @@ msgstr ""
 "શોધ વધુ ચોક્કસ બનાવો અથવા આ સરનામાપોથી માટે \n"
 "ડિરેક્ટરી સર્વર પસંદગીઓની સમય મર્યાદા વધારો."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "આ સરનામાપોથી માટેનો પાશ્વ ભાગ આ પ્રશ્નનું પદચ્છેદન કરવા માટે અસમર્થ છે."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:169
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "આ સરનામાપોથી માટેનો પાશ્વ ભાગ આ પ્રશ્ન ઉકેલવા માટે સહમત નથી."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid "This query did not complete successfully."
 msgstr "આ પ્રશ્ન સફળતાપૂર્વક પૂર્ણ થયો નહિં."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
 msgid "Error adding list"
 msgstr "યાદી ઉમેરવામાં ભૂલ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
 #: ../addressbook/gui/widgets/eab-gui-util.c:670
 msgid "Error adding contact"
 msgstr "સંપર્ક ઉમેરવામાં ભૂલ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error modifying list"
 msgstr "યાદી સુધારવામાં ભૂલ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error modifying contact"
 msgstr "સંપર્ક સુધારવામાં ભૂલ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error removing list"
 msgstr "યાદી કાઢી નાંખવામાં ભૂલ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 #: ../addressbook/gui/widgets/eab-gui-util.c:620
 msgid "Error removing contact"
 msgstr "સંપર્ક કાઢી નાંખવામાં ભૂલ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:299
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3701,16 +3717,16 @@ msgstr[1] ""
 "%d સંપર્કો ખોલવાનું %d નવી વિન્ડો ખોલવા જેવું જ છે.\n"
 "શું તમે ખરેખર આમાંના બધા સંપર્કો જોવા માંગો છો?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:307
 msgid "_Don't Display"
 msgstr "દર્શાવો નહિં (_D)"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
 msgid "Display _All Contacts"
 msgstr "બધા સંપર્કો દર્શાવો (_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:334
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3719,7 +3735,7 @@ msgstr ""
 "%s પહેલાથી જ હાજર છે\n"
 "શું તમે તેના પર ફરીથી લખવા માંગો છો?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:338
 msgid "Overwrite"
 msgstr "ઉપર ફરીથી લખો"
 
@@ -3762,27 +3778,27 @@ msgstr "સંપર્કોને અંહિ ખસેડો"
 msgid "Copy contacts to"
 msgstr "સંપર્કોની નકલ અંહિ કરો"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:883
 msgid "Multiple vCards"
 msgstr "ઘણાબધા vCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 #, c-format
 msgid "vCard for %s"
 msgstr "%s માટે vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:928
 #, c-format
 msgid "Contact information"
 msgstr "સંપર્ક જાણકારી"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:930
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s માટે સંપર્ક જાણકારી"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
 msgid "Querying Address Book..."
 msgstr "સરનામાપોથીને પ્રશ્ન પૂછી રહ્યા છીએ..."
 
@@ -3810,43 +3826,43 @@ msgstr "સરનામાપોથીમાં સંગ્રહો"
 msgid "Card View"
 msgstr "કાર્ડ દેખાવ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../addressbook/importers/evolution-csv-importer.c:658
+#: ../addressbook/importers/evolution-ldif-importer.c:498
 #: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "આયાત કરી રહ્યા છીએ..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "આઉટલુક CSV અથવા ટેબ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "આઉટલુક CSV અને ટેબ આયાત કરનાર"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "મોઝિલ્લા CSV અથવા ટેબ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "મોઝિલ્લા CSV અને ટેબ આયાત કરનાર"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "ઈવોલ્યુશન CSV અથવા ટેબ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "ઈવોલ્યુશન CSV અને ટેબ આયાત કરનાર"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "ઈવોલ્યુશન LDIF આયાત કરનાર"
 
@@ -3899,11 +3915,11 @@ msgid "Format"
 msgstr "બંધારણ"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
 #: ../widgets/table/e-table-field-chooser-item.c:648
 #: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-header-item.c:1908
 #: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
 msgstr "હેડર"
@@ -4006,7 +4022,7 @@ msgstr "છાયા"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -4025,7 +4041,7 @@ msgid "Top:"
 msgstr "ઉપર:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:153
 msgid "Type:"
 msgstr "પ્રકાર:"
 
@@ -4129,11 +4145,21 @@ msgstr "બેકાબુ ભૂલ"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
-msgstr "'{0}' એ માત્ર-વાંચી શકાય તેવો કેલેન્ડર સ્રોત છે. કેલેન્ડર દેખાવમાં બદલો અને કેલેન્ડર પ્રકાશિત કરો કે જે મુલાકાતો સ્વીકારી શકે."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr ""
+
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:4
+#, fuzzy
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr ""
+"'{0}' એ માત્ર-વાંચી શકાય તેવો કેલેન્ડર સ્રોત છે. કેલેન્ડર દેખાવમાં બદલો અને કેલેન્ડર પ્રકાશિત "
+"કરો કે જે મુલાકાતો સ્વીકારી શકે."
 
-#: ../calendar/calendar.error.xml.h:3
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
@@ -4141,7 +4167,7 @@ msgstr ""
 "તમારી મુલાકાતને અર્થવાળો સાર ઉમેરવાનું તમારા મેળવનારાઓને ખબર પાડશે કે તમારી મુલાકાત શેના "
 "વિશે છે."
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:6
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
@@ -4149,271 +4175,275 @@ msgstr ""
 "તમારી બાબતને અર્થવાળો સાર ઉમેરવાનું તમારા મેળવનારાઓને ખબર પાડશે કે તમારી બાબત શેના વિશે "
 "છે."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr "આ મેમોની બધી જાણકારી કાઢી નંખાશે અને ફરીથી સંગ્રહી શકાશે નહિં."
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr "આ મેમોની બધી જાણકારી કાઢી નાંખવામાં આવશે અને ફરીથી સંગ્રહી શકાશે નહિં."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr "આ મુલાકાતો બધી જાણકારી કાઢી નંખાશે અને ફરીથી સંગ્રહી શકાશે નહિં."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "આ બાબતોની બધી જાણકારી કાઢી નંખાશે અને ફરીથી સંગ્રહી શકાશે નહિં."
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:11
 msgid "All information on this appointment will be deleted and can not be restored."
 msgstr "આ મુલાકાતની બધી જાણકારી કાઢી નાંખવામાં આવે છે અને ફરીથી સંગ્રહી શકાશે નહિં."
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:12
 msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "આ મંત્રણાની બધી જાણકારી કાઢી નાંખવામાં આવેલ છે અને ફરીથી સંગ્રહી શકાતી નથી."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr "આ મેમોની બધી જાણકારી કાઢી નાંખવામાં આવેલ છે અને ફરીથી સંગ્રહી શકાતી નથી."
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "આ બાબતની બધી જાણકારી કાઢી નંખાયેલ છે અને ફરીથી સંગ્રહી શકાતી નથી."
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "શું તમે ખરેખર બાબત '{0}' કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "શું તમે ખરેખર '{0}' શીર્ષકવાળી મુલાકાત કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "શું તમે ખરેખર મેમો '{0}' કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "શું તમે ખરેખર {0} મુલાકાતો કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "શું તમે ખરેખર આ {0} મેમો કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "શું તમે ખરેખર આ {0} બાબતો કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "શું તમે ખરેખર આ મુલાકાત કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:179
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "શું તમે ખરેખર આ મંત્રણા કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:21
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "શું તમે ખરેખર આ મેમો કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "શું તમે ખરેખર આ બાબત કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "શું તમે ખરેખર સાર વિના મેમો સંગ્રહવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "શું તમે ખરેખર મુલાકાત સાર વિના મોકલવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "શું તમે ખરેખર બાબર સાર વિના મોકલવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "નવી ઘટના બનાવી શકતા નથી"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "ઘટનાનો સંગ્રહ કરી શકતા નથી"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "શું કેલેન્ડર {૦} કાઢી નાંખવું છે?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "શું મેમો યાદી '{0}' કાઢી નાંખવી છે?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "શું બાબત યાદી '{૦}' કાઢી નાંખવી છે?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "મોકલો નહિં (_n)"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "ડાઉનલોડ પ્રગતિમાં છે. શું તમે મુલાકાત સંગ્રહવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "ડાઉનલોડ પ્રગતિમાં છે. શું તમે બાબત સંગ્રહવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "સંપાદક લોડ કરી શકાયું નહિં."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr "ઈ-મેઈલનું આમંત્રણ બધા સ્પર્ધકોને મોકલવામાં આવે છે અને તેમને આ બાબત સ્વીકારવાની પરવાનગી આપે છે."
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr "ઈ-મેઈલ આમંત્રણો બધા સ્પર્ધકોને મોકલવામાં આવશે અને તેમને પ્રત્યુત્તર કરવાની પરવાનગી આપશે."
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "કેલેન્ડર લાવતી વખતે ભૂલ"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "મેમો યાદી લાવવામાં ભૂલ"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "બાબત યાદી લાવવામાં ભૂલ"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr "જો તમે નકારાત્મક સૂચન મોકલો નહિં, તો બીજા સ્પર્ધકોને ખબર નહિં પડે કે મંત્રણા રદ થઈ ગઈ છે."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
 msgstr "જો તમે નકારાત્મક સૂચન મોકલો નહિં, તો બીજા સ્પર્ધકોને ખબર નહિં પડે કે મેમો કાઢી નંખાયેલ છે."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr "જો તમે નકારાત્મક સૂચન મોકલો નહિં, તો બીજા સ્પર્ધકોને ખબર નહિં પડે કે બાબત કાઢી નંખાયેલ છે."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "સુધારેલી જાણકારી સ્પર્ધકોને મોકલવાથી તેઓ પોતાના કેલેન્ડર પર રાખી શકે છે."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "સ્પર્ધકોને સુધારેલી જાણકારી મોકલવાથી તેઓ પોતાની બાબતોની યાદી સાચવી શકે છે."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "અમુક જોડાણો ડાઉનલોડ થઈ ગયા છે. મુલાકાત સંગ્રહવાનું આ જોડાણો ગુમાવવામાં પરિણમશે."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr "અમુક જોડાણો ડાઉનલોડ થઈ ગયા છે. બાબત સંગ્રહવાનું આ જોડાણોના ગુમાવવામાં પરિણમશે."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr "તમારા વર્તમાન સર્વર સાથે અમુક લક્ષણો યોગ્ય રીતે કામ કરશે નહિં."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "ઈવોલ્યુશન કેલેન્ડરમાંથી અનિચ્છનિય રીતે બહાર નીકળી ગયા."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "ઈવોલ્યુશન મેમો અનિચ્છનીય રીતે બંધ થઈ ગયું."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "ઈવોલ્યુશન બાબતો અનિચ્છનિય રીતે બહાર નીકળી ગઈ."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "કેલેન્ડર એ ઓફલાઈન વપરાશ માટે ચિહ્નિત થયેલ નથી."
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "The memo list is not marked for offline usage"
-msgstr "મેમો યાદી ઓફલાઈન વપરાશ માટે ચિહ્નિત થયેલ નથી"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The memo list is not marked for offline usage."
+msgstr "મેમો યાદી ઓફલાઈન વપરાશ માટે ચિહ્નિત થયેલ નથી."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
 msgstr "બાબત યાદી એ ઓફલાઈન વપરાશ માટે ચિહ્નિત થયેલ નથી."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "આ કેલેન્ડર કાયમ માટે દૂર થઈ જશે."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "મેમો યાદી કાયમ માટે દૂર થઈ જશે."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "આ બાબત યાદી કાયમ માટે દૂર થઈ જશે."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "શું તમે આ મુલાકાતના બદલાવો સંગ્રહવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "શું તમે તમારા ફેરફારો આ મેમોમાં સંગ્રહવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "શું તમે આ બાબતના તમારા બદલાવો સંગ્રહવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "શું તમે આ મેમો માટે નકારાત્મક સૂચન મોકલવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "શું તમે બધા સ્પર્ધકોને નકારાત્મક સૂચન મોકલવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "શું તમે મંત્રણાનું આમંત્રણ સ્પર્ધકોને મોકલવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "શું તમે આ બાબત સ્પર્ધકોને મોકલવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "શું તમે મંત્રણાની સુધારાયેલ જાણકારી સ્પર્ધકોને મોકલવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr "શું તમે સુધારેલી બાબતની જાણકારી સ્પર્ધકોને મોકલવા માંગો છો?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4422,107 +4452,106 @@ msgstr ""
 "તમે બિનઆધારભૂત જૂથપ્રમાણે સર્વર સાથે જોડાઈ રહ્યા છો અને ઈવોલ્યુશન વાપરતી વખતે સમસ્યાઓ "
 "અનુભવશો. શ્રેષ્ઠ પરિણામો માટે, સર્વર એ આધારભૂત આવૃત્તિમાં સુધારાવું જોઈએ."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "તમે આ મુલાકાત બદલી નાંખી છે, પરંતુ હજુ સંગ્રહી નથી."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "તમે આ બાબતમાં ફેરફારો કર્યા છે, પરંતુ હજુ સંગ્રહ્યા નથી."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "તમે આ મેમોમાં ફેરફારો કર્યા છે, પરંતુ તેમને હજુ સુધી સંગ્રહ્યા નથી."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "તમારા કેલેન્ડરો જ્યાં સુધી ઈવોલ્યુશન ફરીથી ચાલુ નહિં થાય ત્યાં સુધી ઉપલબ્ધ નહિં હોય."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "તમારા મેમો ઈવોલ્યુશન પુનઃશરૂ થાય નહિં ત્યાં સુધી ઉપલબ્ધ રહેશે નહિં."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "જ્યાં સુધી ઈવોલ્યુશન ફરીથી ચાલુ નહિં થાય ત્યાં સુધી તમારી બાબતો ઉપલબ્ધ નહિં હોય."
 
-#: ../calendar/calendar.error.xml.h:72
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "ફેરફારો અવગણો (_D)"
 
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "સંગ્રહો (_S)"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "ફેરફારો સંગ્રહો (_S)"
 
-#: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:78
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "મોકલો (_S)"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "સૂચન મોકલો (_S)"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "ઘણા બધા દિવસોની બાબતો છુટી પાડો:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "ઈવોલ્યુશન-માહિતી-સર્વર ચાલુ કરી શકાયુ નહિં"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "પાયલોટનો કેલેન્ડર કાર્યક્રમ બ્લોક વાંચી શક્યા નથી"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "પાયલોટનો મેમો કાર્યક્રમ બ્લોક વાંચી શક્યા નહિં"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "પાયલોટનો મેમો કાર્યક્રમ બ્લોક લખી શક્યા નહિં"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "મૂળભુ પ્રાધાન્ય:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "પાયલોટના કરવાના કાર્યક્રમોનો બ્લોક વાંચી શકાયો નથી"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "પાયલોટનો કરવાનો કાર્યક્રમ બ્લોક લકી શક્યા નહિં"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2334
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "કેલેન્ડર અને બાબતો"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:1403
 msgid "Calendars"
 msgstr "કેલેન્ડરો"
 
@@ -4563,25 +4592,25 @@ msgid "Memo_s"
 msgstr "મેમો (_s)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1151
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
+#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "મેમો"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1441
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
+#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1982
+#: ../calendar/gui/tasks-component.c:540
+#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/importers/icalendar-importer.c:74
+#: ../calendar/importers/icalendar-importer.c:735
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "બાબતો"
@@ -4599,25 +4628,25 @@ msgstr "બાબતો (_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "ઈવોલ્યુશન કેલેન્ડર એલાર્મ સૂચન સેવા"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "મિનિટ"
 msgstr[1] "મિનિટો"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:402
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "કલાકો"
 msgstr[1] "કલાકો"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "શરૂઆતનો સમય"
 
@@ -4628,9 +4657,9 @@ msgstr "મુલાકાતો"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1600
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "સ્થળ:"
@@ -4640,17 +4669,15 @@ msgid "Snooze _time:"
 msgstr "પુનરાવર્તન સમય (_t):"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:52
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "ફેરફાર કરો (_E)"
 
@@ -4662,32 +4689,32 @@ msgstr "પુનરાવર્તન (_S)"
 msgid "location of appointment"
 msgstr "મુલાકાતનું સ્થાન"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
 msgid "No summary available."
 msgstr "કોઈ સાર ઉપલબ્ધ નથી."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No description available."
 msgstr "કોઈ વર્ણન ઉપલબ્ધ નથી."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1478
 msgid "No location information available."
 msgstr "કોઈ જગ્યા જાણકારી ઉપલબ્ધ નથી."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
 #, c-format
 msgid "You have %d alarms"
 msgstr "તમારી પાસે %d એલાર્મો છે"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1684
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1712
+#: ../mail/mail-component.c:1587
 msgid "Warning"
 msgstr "ચેતવણી"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4699,7 +4726,7 @@ msgstr ""
 "ઈ-મેઈલ મોકલવા સાથે રુપરેખાંકિત થયો નથી. ઈવોલ્યુશન\n"
 "સામાન્ય રીમાઈન્ડર સાથે સંવાદ બોક્સ પ્રદર્શિત થશે."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4716,15 +4743,15 @@ msgstr ""
 "\n"
 "શું તમે ખરેખર આ કાર્યક્રમ ચલાવવા માંગો છો?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1732
 msgid "Do not ask me about this program again."
 msgstr "મને આ કાર્યક્રમ વિશે ફરીથી પૂછશો નહિં."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "બોનોબો શરુ કરી શક્યા નથી"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4735,7 +4762,7 @@ msgid "invalid time"
 msgstr "અયોગ્ય સમય"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4744,7 +4771,7 @@ msgstr[0] "%d કલાક"
 msgstr[1] "%d કલાકો"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4755,7 +4782,7 @@ msgstr[1] "%d મિનિટો"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
@@ -4994,12 +5021,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં પરિસ્થિતિ ક્ષેત્ર બતાવો"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "\"પૂર્વદર્શન\" તકતી બતાવો"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "\"પૂર્વદર્શન\" તકતી બતાવો."
 
@@ -5175,66 +5202,66 @@ msgstr "કામ કરવાનો દિવસ શરૂ થાય ત્ય�
 msgid "daylight savings time"
 msgstr "દિવસીય બચાવ સમય"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Summary contains"
 msgstr "સાર સમાવે છે"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Description contains"
 msgstr "વર્ણન સમાવે છે"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Category is"
 msgstr "વર્ગ"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Comment contains"
 msgstr "ટિપ્પળી સમાવે છે"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Location contains"
 msgstr "સ્થાન સમાવે છે"
 
-#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
-#: ../calendar/gui/cal-search-bar.c:685
+#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
+#: ../calendar/gui/cal-search-bar.c:684
 msgid "Unmatched"
 msgstr "બંધબેસતા નથી"
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:630
 msgid "Next 7 Days' Tasks"
 msgstr "આગળના ૭ દિવસોની બાબતો"
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:634
 msgid "Active Tasks"
 msgstr "સક્રિય બાબતો"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:638
 msgid "Overdue Tasks"
 msgstr "જતી રહેલ બાબતો"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:642
 msgid "Completed Tasks"
 msgstr "સમાપ્ત થયેલ બાબતો"
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:646
 msgid "Tasks with Attachments"
 msgstr "જોડાણો સાથેની બાબતો"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:692
 msgid "Active Appointments"
 msgstr "સક્રિય મુલાકાતો"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:696
 msgid "Next 7 Days' Appointments"
 msgstr "આગળના ૭ દિવસની મુલાકાતો"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "છાપો"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5243,16 +5270,16 @@ msgstr ""
 "આ પ્રક્રિયા પસંદ કરેલ સમય કરતાં જૂની બધી ઘટનાઓને કાયમ માટે કાઢી નાંખશે. જો તમે ચાલુ "
 "રાખો, તો તમે આ ઘટનાઓને ફરીથી મેળવી શકો નહિં."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "ના કરતાં જૂની ઘટનાઓ કાઢો"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:397
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../plugins/google-account-setup/google-source.c:403
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "દિવસો"
 
@@ -5260,103 +5287,103 @@ msgstr "દિવસો"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:512
-#: ../calendar/gui/migration.c:610 ../calendar/gui/migration.c:1123
-#: ../calendar/gui/tasks-component.c:231
+#: ../calendar/gui/calendar-component.c:274
+#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
+#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
+#: ../calendar/gui/tasks-component.c:232
 msgid "On The Web"
 msgstr "વેબ પર"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "જન્મદિવસો અને સાલગીરીઓ"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "હવામાન"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:616
 msgid "_New Calendar"
 msgstr "નવું કેલેન્ડર (_N)"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2102
+#: ../calendar/gui/calendar-component.c:617
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "નકલ કરો (_C)..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2116
+#: ../calendar/gui/calendar-component.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "ગુણધર્મો (_P)"
 
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:950
 msgid "Failed upgrading calendars."
 msgstr "કેલેન્ડરો સુધારવામાં નિષ્ફળ."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1249
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "ઘટનાઓ અને મંત્રણાઓ બનાવવા માટે કેલેન્ડર '%s' ખોલવા માટે અસમર્થ"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1265
 msgid "There is no calendar available for creating events and meetings"
 msgstr "ત્યાં ઘટનાઓ અને મંત્રણાઓ બનાવવા ામટે કોઈ કેલેન્ડર ઉપલબ્ધ નથી"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1378
 msgid "Calendar Source Selector"
 msgstr "કેલેન્ડર સ્રોત પસંદ કરનાર"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "નવી મુલાકાત"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
 msgid "_Appointment"
 msgstr "મુલાકાત (_A)"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "નવી મુલાકાત બનાવો"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "નવી મંત્રણા"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
 msgid "M_eeting"
 msgstr "મંત્રણા (_e)"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "નવી મંત્રણા મંજૂરી બનાવો"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "નવી બધા દિવસની મુલાકાત"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
 msgid "All Day A_ppointment"
 msgstr "બધા દિવસની મુલાકાત (_p)"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "નવી બધા દિવસની મુલાકાત બનાવો"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "નવું કેલેન્ડર"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Cale_ndar"
 msgstr "કેલેન્ડર (_n)"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "નવું કેલેન્ડર બનાવો"
 
@@ -5377,15 +5404,220 @@ msgid "Month View"
 msgstr "મહિનાનો દેખાવ"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "કોઇપણ ક્ષેત્ર"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "જોડાણો"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "સભા ભરનાર"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "ધંધો"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "વર્ગ"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "વર્ગીકરણ"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "હરીફાઇ"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "વિશ્વાસજનક"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "વર્ણન"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "વર્ણન સમાવે છે"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "અસ્તિત્વમાં નથી"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "હાજર છે"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "માનીતાંઓ"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "ભેટો"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "લક્ષ્યો/ઉદ્દેશો"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "રજા"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "રજા કાર્ડો"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "વધારે માંગવાળા વાળા સંપર્કો"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "વિચારો"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "આન્તરરાષ્ટ્રીય"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "કી કસ્ટમર"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "વિવિધ"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "પછીના ૭ દિવસો"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "આયોજક"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "ફોન કોલો"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "ખાનગી"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "જાહેર"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:298
+msgid "Recurrence"
+msgstr "વળતર"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "સ્થિતિ"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "નિતિઓ"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "સાર"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "સાર સમાવે છે"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+#, fuzzy
+msgid "Suppliers"
+msgstr "વળતા જવાબો"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "સમય &amp; ખર્ચ"
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "VIP"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "રાહ જોઈ રહ્યા છીએ"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "સમાવે છે"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "સમાવતું નથી"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "છે"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "એ નથી"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "કેલેન્ડર ખોલતી વખતે ભૂલ"
@@ -5398,11 +5630,11 @@ msgstr "કેલેન્ડર ખોલતી વખતે પદ્ધતિ
 msgid "Permission denied to open the calendar"
 msgstr "કેલેન્ડર ખોલવા માટે પરવાનગી નથી"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
 msgid "Unknown error"
 msgstr "અજ્ઞાત ભૂલ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "એલાર્મમાં ફેરફાર કરો"
 
@@ -5435,17 +5667,17 @@ msgid "Mes_sage:"
 msgstr "સંદેશો (_s):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "ધ્વનિ વગાડો"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "ચેતવણી દર્શાવો"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "કાર્યક્રમ ચલાવો"
 
@@ -5458,7 +5690,7 @@ msgid "Send To:"
 msgstr "ને મોકલો:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "ઈ-મેઈલ મોકલો"
 
@@ -5505,7 +5737,10 @@ msgstr "દરેક માટે વધારાનો સમય"
 msgid "hour(s)"
 msgstr "કલાક(ો)"
 
+#. Translators: This is the second half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:247
 msgid "minute(s)"
 msgstr "મિનિટ(ો)"
 
@@ -5513,7 +5748,7 @@ msgstr "મિનિટ(ો)"
 msgid "start of appointment"
 msgstr "મુલાકાતની શરુઆત"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
 msgid "Action/Trigger"
 msgstr "ક્રિયા/ફેરબદલી"
 
@@ -5524,16 +5759,15 @@ msgstr "ઉમેરો (_d)"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "એલાર્મ"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-msg-composer-select-file.c:93
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "જોડાણનું આપોઆપ પ્રદર્શન સૂચવો (_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
 msgid "Attach file(s)"
 msgstr "ફાઈલો જોડો"
 
@@ -5599,8 +5833,8 @@ msgid "Display"
 msgstr "ડિસ્પ્લે"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "શુક્રવાર"
 
@@ -5615,8 +5849,8 @@ msgstr ""
 "દિવસો"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "સોમવાર"
 
@@ -5639,7 +5873,7 @@ msgstr ""
 "રવિવાર"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "રંગ પસંદ કરો"
 
@@ -5649,8 +5883,8 @@ msgid "S_un"
 msgstr "સુર્ય (_u)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "શનિવાર"
 
@@ -5667,8 +5901,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "તારીખ બતાવનારમાં અઠવાડિયાનો ક્રમાંક બતાવો (_n)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "રવિવાર"
 
@@ -5686,8 +5920,8 @@ msgid "Template:"
 msgstr "ટેમ્પલેટ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "ગુરુવાર"
 
@@ -5701,14 +5935,14 @@ msgid "Time format:"
 msgstr "સમયનું બંધારણ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "મંગળવાર"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "બુધવાર"
 
@@ -5786,302 +6020,454 @@ msgstr "બુધ (_W)"
 msgid "before every appointment"
 msgstr "દરેક મુલાકાત પહેલા"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:269
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "ઓફલાઈન પ્રક્રિયા માટે કેલેન્ડરના સમાવિષ્ટોની સ્થાનિક રીતે નકલ કરો (_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "ઓફલાઈન પ્રક્રિયા માટે બાબત યાદી સમાવિષ્ટોની સ્થાનિક રીતે નકલ કરો (_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "ઓફલાઈન પ્રક્રિયા માટે મેમો યાદી સમાવિષ્ટોની સ્થાનિક રીતે નકલ કરો (_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
-msgstr "રંગ (_o):"
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+msgid "Colo_r:"
+msgstr "રંગ (_r):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Task List"
 msgstr "બાબત યાદી"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:389
 msgid "Memo List"
 msgstr "મેમો યાદી"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "Calendar Properties"
 msgstr "કેલેન્ડર ગુણધર્મો"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "New Calendar"
 msgstr "નવું કેલેન્ડર"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "Task List Properties"
 msgstr "બાબત યાદી ગુણધર્મો"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:530
+msgid "New Task List"
+msgstr "નવી કામ યાદી"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
+msgid "Memo List Properties"
+msgstr "મેમો યાદી ગુણધર્મો"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "New Memo List"
 msgstr "નવી મેમો યાદી"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "આ બાબત કાઢી નંખાયેલ છે."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "આ બાબત કાઢી નંખાયેલ છે."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:66
 msgid "This memo has been deleted."
 msgstr "આ મેમો કાઢી નંખાયેલ છે."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  તમે બદલાવો કર્યા છે. તે બદલાવો ભૂલી જાઓ અને સંપાદક બંધ કરો?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  તમે કોઈ ફેરફારો કર્યા નથી, સંપાદક બંધ કરવા માંગો છો?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "આ ઘટના પહેલાથી જ બદલાઈ ગઈ છે."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "બાબત બદલાઈ ગયેલ છે."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:90
 msgid "This memo has been changed."
 msgstr "આ મેમો બદલાઈ ગયેલ છે."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  તમે ફેરફારો કર્યા છે. આ બદલાવો ભુલી જાવ અને સંપાદક સુધારો?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  તમે કોઈ ફેરફારો કર્યા નથી, સંપાદક સુધારવા માંગો છો?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "ચકાસણી ભૂલ: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " પ્રતિ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (પૂર્ણ થયું "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "પૂર્ણ થયું "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (કારણે "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "કારણે "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "જોડાણ સંદેશો - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3037
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
+#: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "જોડાયેલ સંદેશો"
 msgstr[1] "%d જોડાયેલ સંદેશાઓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
-#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "ખસેડો (_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "ખેંચવાનું રદ કરો (_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "જોડાણ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "ઓબ્જેક્ટ સુધારી શક્યા નથી"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "મુલાકાતમાં ફેરફાર કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "મંત્રણા - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "મુલાકાત - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "સોંપાયેલ બાબત - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "બાબત - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "મેમો - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "કોઈ સાર નથી"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "વર્તમાન વિન્ડો ખોલવા માટે અંહિ ક્લિક કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "પસંદ કરેલ લખાણને ક્લિપબોર્ડમાં નકલ કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "પસંદ કરેલ લખાણને ક્લિપબોર્ડમાં કાપો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "ઉપલબ્ધ મદદ જોવા માટે અંહિ ક્લિક કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "ક્લિપબોર્ડમાંથી લખાણ ચોંટાડો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "વર્તમાન વિન્ડો સંગ્રહવા માટે અંહિ ક્લિક કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "બધું લખાણ પસંદ કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "વર્ગીકરણ (_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "ફાઈલ (_F)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "મદદ (_H)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "દાખલ કરો (_I)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "વિકલ્પો (_O)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
+msgid "_View"
+msgstr "દેખાવ (_V)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "જોડાણ (_A)..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "ફાઈલો જોડવા માટે અંહિ ક્લિક કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "વર્ગો (_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "શું વર્ગો દર્શાવવા તે બદલે છે"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "ટાઈમ ઝોન (_Z)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "શું ટાઈમ ઝોન દર્શાવાયેલ છે તે બદલે છે"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "જાહેર (_b)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "જાહેર તરીકે વર્ગીકૃત કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "ખાનગી (_P)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "ખાનગી તરીકે વર્ગીકૃત કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "વિશ્વાસજનક (_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "વિશ્વાસજનક તરીકે વર્ગીકૃત કરો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "ભૂમિકા ક્ષેત્ર (_o)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "શું ભૂમિકા ક્ષેત્ર દર્શાવાયેલ છે તે બદલે છે"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "શું RSVP ક્ષેત્ર દર્શાવાયેલ છે તે બદલે છે"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "પરિસ્થિતિ ક્ષેત્ર (_S)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "શું પરિસ્થિતિ ક્ષેત્ર દર્શાવાયેલ છે તે બદલે છે"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "પ્રકાર ક્ષેત્ર (_T)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+#, fuzzy
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "શું સભાજન પ્રકાર ક્ષેત્ર દર્શાવાયેલ છે તે બદલે છે"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "તાજેતરનો દસ્તાવેજ (_m)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "જોડો"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> જોડાણ"
 msgstr[1] "<b>%d</b> જોડાણો"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "જોડાણ પટ્ટી છુપાવો (_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "જોડાણ પટ્ટી બતાવો (_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3630
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "દૂર કરો (_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
-#: ../composer/e-msg-composer.c:3633
+#: ../calendar/gui/dialogs/comp-editor.c:2036
+#: ../composer/e-msg-composer.c:1049
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "જોડાણ ઉમેરો (_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../mail/em-format-html-display.c:2196
 msgid "Show Attachments"
 msgstr "જોડાણો બતાવો"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "જોડાણ પટ્ટી બદલવા માટે સ્પેસ કી દબાવો"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-msgid "Edit Appointment"
-msgstr "મુલાકાતમાં ફેરફાર કરો"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-#, c-format
-msgid "Meeting - %s"
-msgstr "મંત્રણા - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
-#, c-format
-msgid "Appointment - %s"
-msgstr "મુલાકાત - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "સોંપાયેલ બાબત - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Task - %s"
-msgstr "બાબત - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
-#, c-format
-msgid "Memo - %s"
-msgstr "મેમો - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
-msgid "No summary"
-msgstr "કોઈ સાર નથી"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "આ વસ્તુમાં કરેલા ફેરફારો રદ કરાશે જો સુધારો થાય તો"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "વર્તમાન આવૃત્તિ વાપરવા માટે અસમર્થ!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "સ્રોત ખોલી શક્યા નથી"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "અંતિમ મુકામ ખોલી શક્યા નથી"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "અંતિમ મુકામ માત્ર વાંચી શકાય તેવું છે"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:202
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "શું બાકીના બધા મેળવનારાઓના મેઈલબોક્સમાંથી આ વસ્તુને કાઢી નાંખવી છે (_D)?"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:53
 msgid "The event could not be deleted due to a corba error"
 msgstr "કોર્બા ભૂલને કારણે ઘટના કાઢી શકાય નહિં"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The task could not be deleted due to a corba error"
 msgstr "કોર્બા ભૂલને કારણે બાબત કાઢી શકાઈ નહિં"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The memo could not be deleted due to a corba error"
 msgstr "કોર્બા ભૂલને કારણે મેમો કાઢી શક્યા નહિં"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:62
 msgid "The item could not be deleted due to a corba error"
 msgstr "કોર્બા ભૂલને કારણે વસ્તુ કાઢી શકાઈ નહિં"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:69
 msgid "The event could not be deleted because permission was denied"
 msgstr "પરવાનગી મળી નહિં આથી ઘટના કાઢી શકાઈ નહિં"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The task could not be deleted because permission was denied"
 msgstr "બાબત કાઢી શકાઈ નહિં કારણકે પરવાનગી નથી"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The memo could not be deleted because permission was denied"
 msgstr "મેમો કાઢી શક્યા નહિં કારણકે પરવાનગી નથી"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The item could not be deleted because permission was denied"
 msgstr "વસ્તુ કાઢી શકાઈ નહિં કારણકે પરવાનગી નથી"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:85
 msgid "The event could not be deleted due to an error"
 msgstr "ઘટના ભૂલને કારણે કાઢી શકાઈ નહિં"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:88
 msgid "The task could not be deleted due to an error"
 msgstr "ભૂલને કારણે બાબત કાઢી શકાઈ નહિં"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:91
 msgid "The memo could not be deleted due to an error"
 msgstr "ભૂલને કારણે મેમો કાઢી શક્યા નહિં"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:94
 msgid "The item could not be deleted due to an error"
 msgstr "ભૂલને કારણે વસ્તુ કાઢી શકાઈ નહિં"
 
@@ -6090,7 +6476,7 @@ msgid "Contacts..."
 msgstr "સંપર્કો..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To:"
 msgstr "ને ડિલિગેટ:"
 
@@ -6098,135 +6484,181 @@ msgstr "ને ડિલિગેટ:"
 msgid "Enter Delegate"
 msgstr "ડિલિગેટ દાખલ કરો"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "એલાર્મ (_A)"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr "આ ઘટના માટે એલાર્મો સુયોજિત અથવા અસુયોજિત કરવા માટે અંહિ ક્લિક કરો"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "વળતર (_R)"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "આને રીકરીંગ ઘટના બનાવો"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "મોકલોના વિકલ્પો"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "અદ્યતન મોકલો વિકલ્પો દાખલ કરો"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "બધા દિવસની ઘટના (_D)"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "શું બધા દિવસની ઘટના હોવી જોઈએ તે બદલે છે"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "સમયને વ્યસ્ત બતાવો (_B)"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "શું સમયને વ્યસ્ત તરીકે બતાવો તે બદલે છે"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "મુક્ત/વ્યસ્ત (_F)"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "સભાજનો માટે મુક્ત / વ્યસ્ત જાણકારીનો પ્રશ્ન પૂછો"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "મુલાકાત (_m)"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "વળતર"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "આ ઘટનાને એલાર્મો છે"
 
-#: ../calendar/gui/dialogs/event-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "આયોજક (_g):"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "પ્રતિનિધિઓ (_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "સભાજનો (_n)"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "શરુઆતની તારીખ વગરની ઘટના"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "અંતિમ તારીખ વગરની ઘટના"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "શરુઆતની તારીખ ખોટી છે"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "અંતિમ તારીખ ખોટી છે"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "શરુઆતનો સમય ખોટો છે"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "અંતિમ સમય ખોટો છે"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "પસંદ થયેલ આયોજકને લાંબા સમય સુધી ખાતુ મળશે નહિં."
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "આયોજક જરુરી છે."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "ઓછામાં ઓછો એક સભા ભરનાર તો હોવો જ જોઈએ."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "ઉમેરો (_A) "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "કેલેન્ડર '%s' ખોલી શકાય એમ નથી."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "તમે %s ના વતી કામ કરી રહ્યા છો"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "મુલાકાત પહેલાનો %d દિવસ"
 msgstr[1] "મુલાકાત પહેલાના %d દિવસો "
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "મુલાકાત પહેલાનો %d કલાક"
 msgstr[1] "મુલાકાત પહેલાના %d કલાકો"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "મુલાકાત પહેલાં %d મિનિટ"
 msgstr[1] "મુલાકાત પહેલાં %d મિનિટો"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "વૈવિધ્યપૂર્ણ બનાવો"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2011
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../plugins/itip-formatter/itip-formatter.c:2022
+#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-signature-combo-box.c:69
 msgid "None"
 msgstr "કંઈ નહિં"
 
@@ -6298,28 +6730,24 @@ msgstr "આયોજક બદલો (_h)"
 msgid "Co_ntacts..."
 msgstr "સંપર્કો (_n)..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "આયોજક"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "આયોજક:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "મેમો"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s' માં મેમો ખોલવામાં અસમર્થ."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
-#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "પ્રતિ"
 
@@ -6337,58 +6765,58 @@ msgid "_Description:"
 msgstr "વર્ણન (_D):"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "જૂથ (_G):"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "તમે રીકરીંગ ઘટના સુધારી રહ્યા છો. તમે શું સુધારવા માંગો છો?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "તમે રીકરીંગ ઘટનાનું પ્રતિનિધિત્વ કરી રહ્યા છો. તમે શાનું પ્રતિનિધિત્વ કરવા માંગો છો?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "તમે રીકરીંગ બાબત સુધારી રહ્યા છો. તમે શું સુધારવા માંગો છો?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "તમે રીકરીંગ મેમો સુધારી રહ્યા છો. તમે શું સુધારવા માંગો છો?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "માત્ર આ જ ઘટકે"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "આ અને પહેલાની પળો"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "આ અને ભવિષ્યની પળો"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "બધી પળો"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "આ મુલાકાત વળતર કે જેમાં ઈવોલ્યુશન ફેરફાર કરી શકતું નથી તેને સમાવે છે."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "વળતરવની તારીખ અયોગ્ય છે"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "પર"
 
@@ -6396,7 +6824,7 @@ msgstr "પર"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "પ્રથમ"
 
@@ -6405,7 +6833,7 @@ msgstr "પ્રથમ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "દ્વિતિય"
 
@@ -6413,7 +6841,7 @@ msgstr "દ્વિતિય"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "તૃતિય"
 
@@ -6421,7 +6849,7 @@ msgstr "તૃતિય"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "ચતુર્થ"
 
@@ -6429,13 +6857,13 @@ msgstr "ચતુર્થ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "અંતિમ"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "બીજી તારીખ"
 
@@ -6443,7 +6871,7 @@ msgstr "બીજી તારીખ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "૧ થી ૧૦"
 
@@ -6451,7 +6879,7 @@ msgstr "૧ થી ૧૦"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "૧૧ થી ૨૦"
 
@@ -6459,45 +6887,45 @@ msgstr "૧૧ થી ૨૦"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "૨૧ થી ૩૧"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "દિવસ"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "ના પર"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "વારાઓ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "અપવાદ ઉમેરો"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "સુધારવા માટે પસંદગી મેળવી શક્યા નહિં."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "અપવાદ સુધારો"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "કાઢી નાંખવા માટે પસંદગી મેળવી શક્યા નહિં."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "તારીખ/સમય"
 
@@ -6548,12 +6976,12 @@ msgstr "અઠવાડિયા"
 msgid "year(s)"
 msgstr "વર્ષો"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "સમાપ્ત થયેલ તારીખ ખોટી છે"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "વેબ પાનું"
 
@@ -6568,51 +6996,55 @@ msgstr "<span weight=\"bold\">સ્થિતિ</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "સમાપ્ત"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "ઊંચુ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "પ્રગતિમાં છે"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "નીચું"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "સામાન્ય"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "શરુ થયું નથી"
 
@@ -6625,7 +7057,7 @@ msgid "Stat_us:"
 msgstr "પરિસ્થિતિ (_u):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "વ્યાખ્યાયિત નથી"
 
@@ -6634,7 +7066,7 @@ msgid "_Date completed:"
 msgstr "પૂર્ણ થયેલ તારીખ (_D):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "પ્રાધાન્ય (_P):"
 
@@ -6642,25 +7074,37 @@ msgstr "પ્રાધાન્ય (_P):"
 msgid "_Web Page:"
 msgstr "વેબ પાનું (_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "પરિસ્થિતિ વિગતો (_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+msgid "Click to change or view the status details of the task"
+msgstr "ક્રિયાની પરિસ્થિતિ વિગતો બદલવા અથવા દેખવા ક્લિક કરો"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "મોકલોના વિકલ્પો (_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "બાબત (_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "ક્રિયા વિગતો"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "આયોજક (_z):"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "નક્કી થયેલ તારીખ ખોટી છે"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s' માં બાબતો ખોલવા સમર્થ નથી."
@@ -6686,7 +7130,7 @@ msgid "_Due date:"
 msgstr "પહેલાની તારીખ (_D):"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -6694,142 +7138,126 @@ msgstr[0] "%d દિવસ"
 msgstr[1] "%d દિવસો"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d અઠવાડિયુ"
 msgstr[1] "%d અઠવાડિયાઓ"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "અજ્ઞાત ક્રિયા થઈ ગઈ છે"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s મુલાકાત શરુ થવા પહેલા"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s મુલાકાત શરુ થયા પછી"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s મુલાકાત શરુ થતી વખતે"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s મુલાકાત અંત થયા પહેલા"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s મુલાકાત પૂરી થયા પછી"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s મુલાકાત પૂરી થતી વખતે"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s at %s"
 msgstr "%s તરફ %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s અજ્ઞાત પ્રકારની ફેરબદલી માટે"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ખોલવા માટે ક્લિક કરો"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:160
-#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
-#: ../shell/e-shell-folder-title-bar.c:593
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
 msgid "Untitled"
 msgstr "શીર્ષક વગરનું"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:212
-#: ../calendar/gui/e-cal-component-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
 msgstr "શરુઆતની તારીખ:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:225
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-itip-control.c:1201
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-itip-control.c:1218
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "વર્ણન:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:261
-#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "વેબ પાનું:"
 
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-cal-component-preview.c:210
+#: ../calendar/gui/e-itip-control.c:1162
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "સાર:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "પહેલાની તારીખ:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "સ્થિતિ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "પ્રાધાન્ય:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "જાહેર"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "ખાનગી"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "વિશ્વાસજનક"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "અંતિમ તારીખ"
@@ -6839,21 +7267,14 @@ msgstr "અંતિમ તારીખ"
 msgid "Start Date"
 msgstr "શરુઆતની તારીખ"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "Summary"
-msgstr "સાર"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "મુક્ત"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "વ્યસ્ત"
 
@@ -6868,34 +7289,34 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:746
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "હા"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:165
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "ના"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
-#: ../plugins/itip-formatter/itip-formatter.c:405
-#: ../plugins/itip-formatter/itip-formatter.c:2036
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
+#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
+#: ../plugins/itip-formatter/itip-formatter.c:410
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "અજ્ઞાત"
 
@@ -6907,159 +7328,185 @@ msgstr "વળતર"
 msgid "Assigned"
 msgstr "સોંપેલ"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
 msgid "Save As..."
 msgstr "આ રીતે સંગ્રહો..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2030
 msgid "Select folder to save selected attachments..."
 msgstr "પસંદિત જોડાણો સંગ્રહવા માટે ફોલ્ડર પસંદ કરો..."
 
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
 #, c-format
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:924
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "આ રીતે સંગ્રહો (_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
+#: ../mail/em-popup.c:574
 msgid "Set as _Background"
 msgstr "પાશ્વ ભાગ તરીકે સુયોજિત કરો (_B)"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "પસંદ કરેલ સંગ્રહો (_S)"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
 #, c-format
 msgid "Open in %s..."
 msgstr "%s માં ખોલો..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* કોઈ સાર નથી *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "આયોજક: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:377
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "આયોજક: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "શરુ કરો: "
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "કારણે: "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "૦%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "૧૦%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "૨૦%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "૩૦%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "૪૦%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "૫૦%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "૬૦%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "૭૦%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "૮૦%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "૯૦%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "૧૦૦%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "પસંદ કરેલા ઓબ્જેક્ટો કાઢી રહ્યા છીએ"
 
-#: ../calendar/gui/e-calendar-table.c:952
-#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:643
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "ઓબ્જેક્ટો સુધારી રહ્યા છીએ"
 
-#: ../calendar/gui/e-calendar-table.c:1137
-#: ../calendar/gui/e-calendar-view.c:1227 ../calendar/gui/e-memo-table.c:819
-#: ../composer/e-msg-composer.c:1472
+#: ../calendar/gui/e-calendar-table.c:1348
+#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "આ રીતે સંગ્રહો..."
 
-#: ../calendar/gui/e-calendar-table.c:1360
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "નવી બાબત (_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1364 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "વેબ પાનું ખોલો (_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1366
-#: ../calendar/gui/e-calendar-view.c:1663 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "છાપો (_r)..."
 
-#: ../calendar/gui/e-calendar-table.c:1370
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:929
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "કાપો (_u)"
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1666
-#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "ચોંટાડો (_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1376 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "બાબત સોંપો (_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1377 ../calendar/gui/e-memo-table.c:935
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "iCalendar તરીકે આગળ ધપાવો (_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1378
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "પૂર્ણ થયેલ હોય એમ ચિહ્નિત કરો (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1379
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "પસંદ કરેલ બાબતોને પૂર્ણ થયેલ હોય એમ ચિહ્નિત કરો (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "અપૂર્ણ તરીકે ચિહ્નિત કરો (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "પસંદ કરેલ ક્રિયાઓને અપૂર્ણ તરીકે ચિહ્નિત કરો (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1386
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "પસંદ કરેલ બાબતોને કાઢી નાંખો (_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1623
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "બાબત ઉમેરવા માટે ક્લિક કરો"
@@ -7082,7 +7529,8 @@ msgid "Due date"
 msgstr "પહેલાની તારીખ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "પ્રાધાન્ય"
 
@@ -7090,112 +7538,93 @@ msgstr "પ્રાધાન્ય"
 msgid "Start date"
 msgstr "શરુઆતની તારીખ"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "સ્થિતિ"
-
-#: ../calendar/gui/e-calendar-view.c:1346
+#: ../calendar/gui/e-calendar-view.c:1349
 msgid "Moving items"
 msgstr "વસ્તુઓ ખસેડી રહ્યા છીએ"
 
-#: ../calendar/gui/e-calendar-view.c:1348
+#: ../calendar/gui/e-calendar-view.c:1351
 msgid "Copying items"
 msgstr "વસ્તુઓની નકલ કરી રહ્યા છીએ"
 
-#: ../calendar/gui/e-calendar-view.c:1657
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New _Appointment..."
 msgstr "નવી મુલાકાત (_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1658
+#: ../calendar/gui/e-calendar-view.c:1661
 msgid "New All Day _Event"
 msgstr "નવી બધા દિવસની ઘટના (_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1662
 msgid "New _Meeting"
 msgstr "નવી મંત્રણા (_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1670
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "_Current View"
 msgstr "વર્તમાન દેખાવ (_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1675
 msgid "Select T_oday"
 msgstr "આજનો દિવસ પસંદ કરો (_d)"
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1676
 msgid "_Select Date..."
 msgstr "તારીખ પસંદ કરો (_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Pri_nt..."
 msgstr "છાપો (_n)..."
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "Cop_y to Calendar..."
 msgstr "કેલેન્ડરમાં નકલ કરો (_y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Mo_ve to Calendar..."
 msgstr "કેલેન્ડરમાં ખસેડો (_v)..."
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Delegate Meeting..."
 msgstr "પ્રતિનિધી મંત્રણા (_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "_Schedule Meeting..."
 msgstr "સમયક્રમ મંત્રણા (_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar તરીકે આગળ ધપાવો (_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1697
 msgid "_Reply"
 msgstr "પ્રત્યુત્તર (_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
+#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "બધાને વળતો જવાબ આપો (_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1703
 msgid "Make this Occurrence _Movable"
 msgstr "આ વારાને ખસેડાય તેવો બનાવો (_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "આ વારો કાઢી નાંખો (_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1705
 msgid "Delete _All Occurrences"
 msgstr "બધા વારાઓ કાઢી નાંખો (_A)"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2202
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "આયોજક: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2206
-#, c-format
-msgid "Organizer: %s"
-msgstr "આયોજક: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2222 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "સ્થળ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "સમય: %s %s"
@@ -7223,7 +7652,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:807
+#: ../calendar/gui/e-day-view-time-item.c:589
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i મિનિટ ભાગલાઓ"
@@ -7234,46 +7663,34 @@ msgstr "%02i મિનિટ ભાગલાઓ"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1359
-#: ../calendar/gui/e-day-view.c:2141
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1672
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:766 ../calendar/gui/e-day-view.c:1119
-#: ../calendar/gui/e-week-view.c:507 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "સવાર"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:769 ../calendar/gui/e-day-view.c:1122
-#: ../calendar/gui/e-week-view.c:510 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "સાંજ"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "હા. (જટિલ વળતર)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "દર રોજ"
 msgstr[1] "દર %d દિવસો"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
@@ -7281,9 +7698,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "દર અઠવાડિયુ"
 msgstr[1] "દર %d અઠવાડિયાઓ"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7291,51 +7706,35 @@ msgstr[0] "દર અઠવાડિયા પર"
 msgstr[1] "દર %d અઠવાડિયાઓ પર"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " અને "
 
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "%s નો દિવસ "
 
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s નો "
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "દર મહિનો"
 msgstr[1] "દર %d મહિનાઓ"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "દર વર્ષ"
 msgstr[1] "દર %d વર્ષે"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7343,332 +7742,332 @@ msgstr[0] "%d સમયનું કુલ"
 msgstr[1] " %d સમયોનું કુલ"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", અંત થાય છે "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "શરુ થાય છે"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "અંત થાય છે"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "પહેલા"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "iCalendar જાણકારી"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "iCalendar ભૂલ"
 
-#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
-#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:521
+#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "અજ્ઞાત વ્યક્તિ"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1126
+#: ../calendar/gui/e-itip-control.c:1143
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> મહેરબાની કરીને નીચેની જાણકારી જુઓ, અને નીચેના મેનુમાંથી ક્રિયા પસંદ કરો."
 
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/itip-utils.c:728
-#: ../plugins/itip-formatter/itip-formatter.c:2024
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/itip-utils.c:664
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "સ્વીકારાયેલ"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2027
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "ભાર મૂકીને સ્વીકારાયેલ છે"
 
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
-#: ../plugins/itip-formatter/itip-formatter.c:2030
+#: ../calendar/gui/e-itip-control.c:1199
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "નકારાયેલ છે"
 
-#: ../calendar/gui/e-itip-control.c:1266
+#: ../calendar/gui/e-itip-control.c:1283
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "મંત્રણા રદ થઈ ગયેલ છે, તેમછતાં પણ તે તમારા કેલેન્ડરોમાં મેળવી શકાશે નહિં"
 
-#: ../calendar/gui/e-itip-control.c:1268
+#: ../calendar/gui/e-itip-control.c:1285
 msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr "બાબત રદ થઈ ગયેલ છે, તેમછતાં પણ તે તમારી બાબત યાદીમાં મેળવી શકાઈ નથી"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> એ મંત્રણાની જાણકારી મોકલી છે."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "મંત્રણા જાણકારી"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1370
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> %s ની મંત્રણા સમયે હાજરીની માંગ કરે છે."
 
-#: ../calendar/gui/e-itip-control.c:1355
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> મંત્રણા સમયે તમારી હાજરીની માંગ કરે છે."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "મત્રણાનો પ્રસ્તાવ"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> હાલની મંત્રણામાં ઉમેરાવાની ઈચ્છા ધરાવે છે."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "મંત્રણા સુધારો"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> મંત્રણાની તાજી જાણકારી મેળવવાની ઈચ્છા ધરાવે છે."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "મંત્રણા સુધારાની મંજૂરી"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> એ મંત્રણાની મંજૂરીને વળતો જવાબ આપ્યો."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "મંત્રણાનો વળતો જવાબ"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> એ મંત્રણા રદ કરી નાંખી."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "મંત્રણા રદ"
 
-#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1528
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> એ હોશિયાર નહિં હોય એવો સંદેશો મોકલ્યો."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "મંત્રણાના ખરાબ સંદેશો"
 
-#: ../calendar/gui/e-itip-control.c:1422
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> એ બાબતની જાણકારી પ્રકાશિત કરી."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "બાબતની જાણકારી"
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1447
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> એ %s ને બાબત કરવા માટે મંજૂરી મોકલે છે."
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> એ તમને બાબત કરવા માટે મંજૂરી મોકલે છે."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "બાબતનો પ્રસ્તાવ"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> હાલની ક્રિયામાં ઉમેરવાની ઈચ્છા ધરાવે છે."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "બાબતનો સુધારો"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> એ બાબતની તાજી જાણકારી મેળવવાની ઈચ્છા ધરાવે છે."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "બાબત સુધારોની મંજૂરી"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> એ બાબતની સોંપણી માટે વળતો જવાબ આપ્યો."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "બાબતનો વળતો જવાબ"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> એ બાબત નકારી કાઢી હતી."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "બાબત રદ"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "ખરાબ બાબત સંદેશો"
 
-#: ../calendar/gui/e-itip-control.c:1496
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> એ મુક્ત/વ્યસ્ત જાણકારી પ્રકાશિત કરી હતી."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "મુક્ત/વ્યસ્ત જાણકારી"
 
-#: ../calendar/gui/e-itip-control.c:1501
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> તમારી મુક્ત/વ્યસ્ત જાણકારી માટે મંજૂરી મોકલે છે."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "મુક્ત/વ્યસ્ત મંજૂરી"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> એ મુક્ત/વ્યસ્ત મંજૂરી માટે વળતો જવાબ આપ્યો."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "મુક્ત/વ્યસ્ત વળતો જવાબ"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "ખરાબ મુક્ત/વ્યસ્ત સંદેશો"
 
-#: ../calendar/gui/e-itip-control.c:1588
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message does not appear to be properly formed"
 msgstr "સંદેશો યોગ્ય રીતે ઘડાયેલ હોય એમ લાગતું નથી"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "સંદેશો માત્ર બિનઆધારભૂત મંજૂરીઓ સમાવે છે."
 
-#: ../calendar/gui/e-itip-control.c:1680
+#: ../calendar/gui/e-itip-control.c:1697
 msgid "The attachment does not contain a valid calendar message"
 msgstr "જોડાણ એ માન્ય કેલેન્ડર સંદેસો સમાવતું નથી"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "જોડાણ પાસે કોઈ જોઈ શકાય તેવી કેલેન્ડર વસ્તુઓ નથી"
 
-#: ../calendar/gui/e-itip-control.c:1954
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "સુધારો પૂર્ણ થયો\n"
 
-#: ../calendar/gui/e-itip-control.c:1988
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "ઓબ્જેક્ટ અયોગ્ય છે અને સુધારી શકાશે નહિં\n"
 
-#: ../calendar/gui/e-itip-control.c:2005
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "આ જવાબ એ વર્તમાન સભાસદમાંથી નથી.  સભાસદ તરીકે ઉમેરવો છો?"
 
-#: ../calendar/gui/e-itip-control.c:2023
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "સભાસદ સ્થિતિ સુધારી શકાઈ નથી અમાન્ય સ્થિતિને કારણે!\n"
 
-#: ../calendar/gui/e-itip-control.c:2047
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "સભાસદની સ્થિતિ સુધારાઈ ગઈ\n"
 
-#: ../calendar/gui/e-itip-control.c:2054
-#: ../plugins/itip-formatter/itip-formatter.c:1242
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1254
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "સભાસદની સ્થિતિ સુધારી શકાશે નહિં કારણકે વસ્તુ લાંબો સમય સુધી અસ્તિત્વમાં રહેવાની નથી"
 
-#: ../calendar/gui/e-itip-control.c:2085 ../calendar/gui/e-itip-control.c:2142
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "વસ્તુ મોકલી દીધી!\n"
 
-#: ../calendar/gui/e-itip-control.c:2091 ../calendar/gui/e-itip-control.c:2150
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "વસ્તુ મોકલી શકાઈ નથી!\n"
 
-#: ../calendar/gui/e-itip-control.c:2230
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "ક્રિયા પસંદ કરો:"
 
-#: ../calendar/gui/e-itip-control.c:2301
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "સુધારો"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2355
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "સ્વીકારો"
 
-#: ../calendar/gui/e-itip-control.c:2330
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "ભાર મૂકીને સ્વીકારો"
 
-#: ../calendar/gui/e-itip-control.c:2331
+#: ../calendar/gui/e-itip-control.c:2357
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "નકારો"
 
-#: ../calendar/gui/e-itip-control.c:2360
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "મુક્ત/વ્યસ્ત જાણકારી મોકલો"
 
-#: ../calendar/gui/e-itip-control.c:2388
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "જવાબ આપવાની સ્થિતિ સુધારો"
 
-#: ../calendar/gui/e-itip-control.c:2416
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "તાજી જાણકારી મોકલો"
 
-#: ../calendar/gui/e-itip-control.c:2444 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "રદ કરો"
@@ -7697,112 +8096,112 @@ msgstr "કેલેન્ડર લાવી રહ્યા છીએ..."
 msgid "Server Message:"
 msgstr "સર્વર સંદેશો:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "સભામંત્રી"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "ી ભાગ લેનાર જરુરી છેાઓ"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "વૈકલ્પિક સ્પર્ધકો"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "સ્રોતો"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "સભાજનો"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
 msgid "Individual"
 msgstr "અંગત"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "જૂથ"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:967
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:983
 msgid "Resource"
 msgstr "સ્રોત"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
+#: ../calendar/gui/print.c:984
 msgid "Room"
 msgstr "ખંડ"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/print.c:998
 msgid "Chair"
 msgstr "ખુરશી"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/e-meeting-store.c:746 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
 msgid "Required Participant"
 msgstr "જરુરી સ્પર્ધક"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:1000
 msgid "Optional Participant"
 msgstr "વૈકલ્પિક સ્પર્ધક"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "સ્પર્ધક નથી"
 
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:756
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:753
 msgid "Needs Action"
 msgstr "ક્રિયા જરુરી છે"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Tentative"
 msgstr "જરુરી"
 
-#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/itip-utils.c:737
-#: ../plugins/itip-formatter/itip-formatter.c:2033
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/itip-utils.c:673
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "ડિલિગેટ થયેલ"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:484
+#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr "સભાજન                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../calendar/gui/e-meeting-list-view.c:533
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
 msgstr "પ્રગતિમાં"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:473
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7810,85 +8209,81 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:481
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "ઓફિસની બહાર"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "કોઈ જાણકારી નથી"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "સભાજનો (_t)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "વિકલ્પો (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "માત્ર કામ કરવાના કલાકો બતાવો (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "નાનું કરેલ બતાવો (_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "સુધારો મુક્ત/વ્યસ્ત (_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "આપોઆપ લઈ લો (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "બધા લોકો અને સ્રોતો (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "બધા લોકો અને એક સ્રોત (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "જરુરી લોકો (_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "જરુરી લોકો અને એક સ્રોત (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "શરુઆતનો સમય (_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "અંતિમ સમય (_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "સભા ભરનાર"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "સભા ભરનાર ઉમેરવા માટે અંહિ ક્લિક કરો"
@@ -7913,16 +8308,16 @@ msgstr "ભાષા"
 msgid "Member"
 msgstr "સભ્ય"
 
-#: ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-memo-table.c:942
 msgid "_Delete Selected Memos"
 msgstr "પસંદ કરેલ મેમો કાઢી નાંખો (_D)"
 
-#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "મેમો ઉમેરવા માટે ક્લિક કરો"
 
-#: ../calendar/gui/e-memos.c:790 ../calendar/gui/e-tasks.c:922
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/gnome-cal.c:2864
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7931,85 +8326,84 @@ msgstr ""
 "%s પર ભૂલ છે:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:839
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "મેમો લાવી રહ્યા છીએ"
 
-#: ../calendar/gui/e-memos.c:920
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s આગળ મેમો ખોલી રહ્યા છીએ"
 
-#: ../calendar/gui/e-memos.c:1093 ../calendar/gui/e-tasks.c:1333
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "પસંદ કરેલ ઓબ્જેક્ટો કાઢી રહ્યા છીએ..."
 
-#: ../calendar/gui/e-tasks.c:975
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "બાબતો લાવી રહ્યા છીએ"
 
-#: ../calendar/gui/e-tasks.c:1065
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s તરફ બાબતો ખોલી રહ્યા છીએ"
 
-#: ../calendar/gui/e-tasks.c:1310
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "બાબતો પૂર્ણ કરી રહ્યા છીએ..."
 
-#: ../calendar/gui/e-tasks.c:1360
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "અર્થ કાઢી રહ્યા છીએ"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:130
 msgid "Select Timezone"
 msgstr "ટાઈમઝોન પસંદ કરો"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:828
+#: ../calendar/gui/gnome-cal.c:830
 msgid "Updating query"
 msgstr "પ્રશ્ન સુધારી રહ્યા છીએ"
 
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2501
 msgid "_Custom View"
 msgstr "વૈવિધ્યપૂર્ણ દેખાવ (_C)"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2502
 msgid "_Save Custom View"
 msgstr "વૈવિધ્યપૂર્ણ દેખાવ સંગ્રહો (_S)"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2507
 msgid "_Define Views..."
 msgstr "દેખાવો વ્યાખ્યાયિત કરો (_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2688
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s તરફ મુલાકાતો લાવી રહ્યા છીએ"
 
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2707
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s તરફ બાબતો લાવી રહ્યા છીએ"
 
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2716
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s આગળ મેમો લાવી રહ્યા છીએ"
 
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2823
 #, c-format
 msgid "Opening %s"
 msgstr "%s ખોલી રહ્યા છીએ"
 
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3779
 msgid "Purging"
 msgstr "ભેગું કરી રહ્યા છીએ"
 
@@ -8069,136 +8463,143 @@ msgstr "સપ્ટેમ્બર"
 msgid "_Select Today"
 msgstr "આજનો દિવસ પસંદ કરો (_S)"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../calendar/gui/itip-utils.c:544
 msgid "An organizer must be set."
 msgstr "આયોજક સુયોજિત કરેલો જ હોવો જોઈએ."
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "ઓછામાં ઓછો એક સભાસદ હોવો જરુરી છે"
 
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "ઘટનાની જાણકારી"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "બાબતની જાણકારી"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "મેમો જાણકારી"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "મુક્ત/વ્યસ્ત જાણકારી"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "કેલેન્ડર જાણકારી"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "સુધારાયેલ"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "ફરી તાજુ કરો"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "ગળકનો પ્રસ્તાવ"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "મુક્ત/વ્યસ્ત જાણકારી (%s ને %s)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iCalendar જાણકારી"
 
-#: ../calendar/gui/itip-utils.c:1008
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "તમે ઘટનાના સભાસદ હોવા જ જોઈએ."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:465
 msgid "_New Memo List"
 msgstr "નવી મેમો યાદી (_N)"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:545
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d મેમો"
 msgstr[1] "%d મેમો"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d પસંદ થયેલ"
 msgstr[1] ", %d પસંદ થયેલ"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:594
 msgid "Failed upgrading memos."
 msgstr "મેમો સુધારવામાં નિષ્ફળ."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:954
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "ઘટનાઓ અને મંત્રણાઓ બનાવવા માટે મેમો યાદી '%s' ખોલવામાં અસમર્થ"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:967
 msgid "There is no calendar available for creating memos"
 msgstr "મેમો બનાવવા માટે કોઈ કેલેન્ડર ઉપલબ્ધ નથી"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1077
 msgid "Memo Source Selector"
 msgstr "મેમો સ્રોત પસંદ કરનાર"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "નવી મેમો"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
 msgstr "મેમો (_o)"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "નવી મેમો બનાવો"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "નવો વહેંચાયેલ મેમો"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "વહેંચાયેલ મેમો (_S)"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "વહેંચાયેલ નવો મેમો બનાવો"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "નવી મેમો યાદી"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "મેમો યાદી (_s)"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "નવી મેમો યાદી બનાવો"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
 msgstr "મેમો છાપો"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "આગળના ૭ દિવસો"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8209,7 +8610,7 @@ msgstr ""
 "\n"
 "મહેરબાની કરીને ઈવોલ્યુશન તમારા ફોલ્ડરોને ખસેડે ત્યાં સુધી શાંતિ દાખવો..."
 
-#: ../calendar/gui/migration.c:168
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8221,27 +8622,27 @@ msgstr ""
 "મહેરબાની કરીને ઈવોલ્યુશન તમારા ફોલ્ડરોને ખસેડે ત્યાં સુધી શાંતિ દાખવો..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:781 ../calendar/gui/migration.c:949
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "evolution/config.xmldb માંથી જૂના સુયોજનો ફેરવવામાં અસમર્થ"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:810
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "કેલેન્ડર `%s' ને ફેરવવામાં અસમર્થ"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:978
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "બાબતો `%s' ફેરવવામાં અસમર્થ"
 
 #: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
 msgid "Notes"
 msgstr "નોંધો"
 
@@ -8398,118 +8799,125 @@ msgstr "શુક્ર"
 msgid "Sa"
 msgstr "શનિ"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "મુલાકાત"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "બાબત"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "સાર: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "સભાજનો: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "સ્થિતિ: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "પ્રાધાન્ય: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "પૂર્ણ થયેલ ટકા: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "વર્ગો: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "સંપર્કો: "
 
 #. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:2762
 msgid "Upcoming Appointments"
 msgstr "આવી રહેલ મુલાકાતો"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:456
 msgid "_New Task List"
 msgstr "નવી બાબત યાદી (_N)"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:536
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d બાબત"
 msgstr[1] "%d બાબતો"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:585
 msgid "Failed upgrading tasks."
 msgstr "બાબતો સુધારવામાં નિષ્ફળ ગયા."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:942
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "ઘટનાઓ અને મંત્રણાઓ બનાવવા માટે બાબત યાદી '%s' ખોલવામાં અસમર્થ"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:955
 msgid "There is no calendar available for creating tasks"
 msgstr "બાબતો બનાવવા માટે કોઈ કેલેન્ડર ઉપલબ્ધ નથી"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1066
 msgid "Task Source Selector"
 msgstr "બાબત સ્રોત પસંદ કરનાર"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "નવી બાબત"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "બાબત (_T)"
+
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "નવી બાબત બનાવો"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "નવી સોંપાયેલ બાબત"
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "સોંપાયેલ બાબત (_d)"
 
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "નવી સોંપાયેલ બાબત બનાવો"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "નવી બાબત યાદી"
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
 msgstr "બાબત યાદી (_k)"
 
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "નવી બાબત યાદી બનાવો"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../calendar/gui/tasks-control.c:452
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8521,49 +8929,70 @@ msgstr ""
 "\n"
 "શું ખરેખર આ બાબતો કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "મને ફરી વાર પૂછશો નહિં."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "બાબતો છાપો"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% પૂરુ થયું"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "નકારાઈ ગયું"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "પ્રગતિમાં છે"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "ના કરતાં મોટું છે"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "ના કરતાં નાનું છે"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "મુલાકાતો અને મંત્રણાઓ"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1570
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1578
 msgid "Opening calendar"
 msgstr "કેલેન્ડર ખોલી રહ્યા છીએ"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar ફાઈલો (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "ઈવોલ્યુશન iCalendar આયાત કરનાર"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "યાદ અપાવનાર!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar ફાઈલો (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "ઈવોલ્યુશન vCalendar આયાત કરનાર"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "કેલેન્ડર ઘટનાઓ"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "ઈવોલ્યુશન કેલેન્ડર હોશિયાત આયાત કરનાર"
 
@@ -10097,123 +10526,303 @@ msgstr "પેસિફિક/વાલિસ"
 msgid "Pacific/Yap"
 msgstr "પેસિફિક/યેપ"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "સરનામાપોથી માટે અંહિ ક્લિક કરો"
+#: ../composer/e-composer-autosave.c:275
+#, fuzzy
+msgid "Could not open autosave file"
+msgstr "ફાઈલ ખોલી શક્યા નથી"
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "અંતિમ મુકામ મોકલી રહ્યા છીએ"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "સંપાદકમાંથી સંદેશો મેળવવા સમર્થ નથી"
 
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "સંદેશાઓ મોકલવા માટે ફોલ્ડર પસંદ કરો."
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "જોડાણ ઉમેરો"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "અંહિ પોસ્ટ કરવા માટે ફોલ્ડરો પસંદ કરો"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "જોડો (_t)"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "સહી (_g):"
+#: ../composer/e-composer-actions.c:143
+msgid "Untitled Message"
+msgstr "શીર્ષક વગરનો સંદેશો"
+
+#: ../composer/e-composer-actions.c:474
+msgid "Attach a file"
+msgstr "ફાઈલ જોડો"
+
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "બંધ કરો (_C)"
+
+#: ../composer/e-composer-actions.c:481
+msgid "Close the current file"
+msgstr "વર્તમાન ફાઈલ બંધ કરો"
+
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "છાપો (_P)..."
+
+#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "છાપનનું પૂર્વદર્શન (_v)"
+
+#: ../composer/e-composer-actions.c:502
+msgid "Save the current file"
+msgstr "વર્તમાન ફાઈલ સંગ્રહો"
+
+#: ../composer/e-composer-actions.c:507
+msgid "Save _As..."
+msgstr "આ રીતે સંગ્રહો (_A)..."
+
+#: ../composer/e-composer-actions.c:509
+msgid "Save the current file with a different name"
+msgstr "વર્તમાન ફાઈલ અલગ નામથી સંગ્રહો"
+
+#: ../composer/e-composer-actions.c:514
+msgid "Save _Draft"
+msgstr "ડ્રાફ્ટ સંગ્રહો (_D)"
+
+#: ../composer/e-composer-actions.c:516
+msgid "Save as draft"
+msgstr "ડ્રાફ્ટ તરીકે સંગ્રહો"
+
+#: ../composer/e-composer-actions.c:521
+msgid "S_end"
+msgstr "મોકલો (_e)"
+
+#: ../composer/e-composer-actions.c:523
+msgid "Send this message"
+msgstr "આ સંંદેશાને મોકલો"
+
+#: ../composer/e-composer-actions.c:530
+msgid "Insert Send options"
+msgstr "મોકલો વિકલ્પો દાખલ કરો"
+
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "નવો સંદેશો (_M)"
+
+#: ../composer/e-composer-actions.c:537
+msgid "Open New Message window"
+msgstr "નવા સંદેશા વિન્ડો ખોલો"
+
+#: ../composer/e-composer-actions.c:544
+msgid "Character _Encoding"
+msgstr "અક્ષરોની સંગ્રહપદ્ધતિ (_E)"
+
+#: ../composer/e-composer-actions.c:551
+msgid "_Security"
+msgstr "સુરક્ષા (_S)"
+
+#: ../composer/e-composer-actions.c:561
+msgid "PGP _Encrypt"
+msgstr "PGP એનક્રિપ્ટ (_E)"
+
+#: ../composer/e-composer-actions.c:563
+msgid "Encrypt this message with PGP"
+msgstr "આ સંદેશાને PGP સાથે એનક્રિપ્ટ કરો"
+
+#: ../composer/e-composer-actions.c:569
+msgid "PGP _Sign"
+msgstr "PGP સહી (_S)"
+
+#: ../composer/e-composer-actions.c:571
+msgid "Sign this message with your PGP key"
+msgstr "આ સંદેશાને તમારી PGP કી સાથે સહી કરો"
+
+#: ../composer/e-composer-actions.c:577
+msgid "_Prioritize Message"
+msgstr "સંદેશાનું પ્રાધાન્યકરણ કરો (_P)"
+
+#: ../composer/e-composer-actions.c:579
+msgid "Set the message priority to high"
+msgstr "સંદેશા પ્રાધાન્યને ઊંચી સુયોજિત કરો"
+
+#: ../composer/e-composer-actions.c:585
+msgid "Re_quest Read Receipt"
+msgstr "વાંચન રસીદની અરજી કરો (_q)"
+
+#: ../composer/e-composer-actions.c:587
+msgid "Get delivery notification when your message is read"
+msgstr "જ્યારે તમારો સંદેશો વંચાય ત્યારે પહોંચ સૂચન મેળવો"
+
+#: ../composer/e-composer-actions.c:593
+msgid "S/MIME En_crypt"
+msgstr "S/MIME એનક્રિપ્ટ (_c)"
+
+#: ../composer/e-composer-actions.c:595
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "તમારા S/MIME એનક્રિપ્શન પ્રમાણપત્ર સાથે આ સંદેશો એનક્રિપ્ટ કરો"
+
+#: ../composer/e-composer-actions.c:601
+msgid "S/MIME Sig_n"
+msgstr "S/MIME સહી (_n)"
+
+#: ../composer/e-composer-actions.c:603
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "આ સંદેશાને તમારી S/MIME સહી પ્રમાણપત્ર સાથે સહી કરો"
+
+#: ../composer/e-composer-actions.c:609
+msgid "_Bcc Field"
+msgstr "આને પણ ખબર વિના ક્ષેત્ર (_B)"
+
+#: ../composer/e-composer-actions.c:611
+msgid "Toggles whether the BCC field is displayed"
+msgstr "આને પણ ખબર વિના ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
+
+#: ../composer/e-composer-actions.c:617
+msgid "_Cc Field"
+msgstr "આને પણ ક્ષેત્ર (_C)"
+
+#: ../composer/e-composer-actions.c:619
+msgid "Toggles whether the CC field is displayed"
+msgstr "આને પણ ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
+
+#: ../composer/e-composer-actions.c:625
+msgid "_From Field"
+msgstr "તરફથી ક્ષેત્ર (_F)"
+
+#: ../composer/e-composer-actions.c:627
+msgid "Toggles whether the From chooser is displayed"
+msgstr "શું તરફથી પસંદ કરનાર પ્રદર્શિત છે તે ફેરબદલી કરો"
+
+#: ../composer/e-composer-actions.c:633
+msgid "_Post-To Field"
+msgstr "ને પોસ્ટ કરો ક્ષેત્ર (_P)"
+
+#: ../composer/e-composer-actions.c:635
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "શું ને પોસ્ટ કરો ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
+
+#: ../composer/e-composer-actions.c:641
+msgid "_Reply-To Field"
+msgstr "ને વળતો જવાબ આપો ક્ષેત્ર (_R)"
+
+#: ../composer/e-composer-actions.c:643
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "શું ને વળતો જવાબ આપો ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
+
+#: ../composer/e-composer-actions.c:649
+msgid "_Subject Field"
+msgstr "વિષય ક્ષેત્ર (__S)"
+
+#: ../composer/e-composer-actions.c:651
+#, fuzzy
+msgid "Toggles whether the Subject field is displayed"
+msgstr "શું પરિસ્થિતિ ક્ષેત્ર દર્શાવાયેલ છે તે બદલે છે"
+
+#: ../composer/e-composer-actions.c:657
+msgid "_To Field"
+msgstr "પ્રતિ ક્ષેત્ર (_T)"
+
+#: ../composer/e-composer-actions.c:659
+msgid "Toggles whether the To field is displayed"
+msgstr "શું પ્રતિ ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
+
+#: ../composer/e-composer-header-table.c:66
+msgid "Enter the recipients of the message"
+msgstr "સંદેશાના મેળવનારાઓ દાખલ કરો"
 
-#: ../composer/e-msg-composer-hdrs.c:326
+#: ../composer/e-composer-header-table.c:68
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "સરનામાઓ દાખલ કરો કે જેઓ પણ સંદેશાની કાર્બન નકલ મેળવે"
+
+#: ../composer/e-composer-header-table.c:71
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message"
+msgstr "સરનામાઓ દાખલ કરો કે જે સંદેશાની મેળવનાર યાદીમાં સંદેશા દેખાવ્યા વિના નકલ મેળવશે"
+
+#: ../composer/e-composer-header-table.c:645
 msgid "Fr_om:"
 msgstr "તરફથી (_o):"
 
-#: ../composer/e-msg-composer-hdrs.c:332
+#: ../composer/e-composer-header-table.c:654
 msgid "_Reply-To:"
 msgstr "પ્રતિ-પ્રત્યુત્તર આપો (_R):"
 
-#: ../composer/e-msg-composer-hdrs.c:335
+#: ../composer/e-composer-header-table.c:658
 msgid "_To:"
 msgstr "પ્રતિ (_T):"
 
-#: ../composer/e-msg-composer-hdrs.c:337
-msgid "Enter the recipients of the message"
-msgstr "સંદેશાના મેળવનારાઓ દાખલ કરો"
-
-#: ../composer/e-msg-composer-hdrs.c:340
+#: ../composer/e-composer-header-table.c:663
 msgid "_Cc:"
 msgstr "આને પણ (_C):"
 
-#: ../composer/e-msg-composer-hdrs.c:342
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "સરનામાઓ દાખલ કરો કે જેઓ પણ સંદેશાની કાર્બન નકલ મેળવે"
-
-#: ../composer/e-msg-composer-hdrs.c:346
+#: ../composer/e-composer-header-table.c:668
 msgid "_Bcc:"
 msgstr "આને પણ ખબર વિના (_B):"
 
-#: ../composer/e-msg-composer-hdrs.c:348
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message"
-msgstr "સરનામાઓ દાખલ કરો કે જે સંદેશાની મેળવનાર યાદીમાં સંદેશા દેખાવ્યા વિના નકલ મેળવશે"
-
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "ને પોસ્ટ કરો (_P):"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "વિષય (_u):"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "જોડો (_t)"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "સહી (_g):"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "જોડાણ ઉમેરો"
+#: ../composer/e-composer-name-header.c:114
+msgid "Click here for the address book"
+msgstr "સરનામાપોથી માટે અંહિ ક્લિક કરો"
 
-#: ../composer/e-msg-composer.c:819
+#: ../composer/e-composer-post-header.c:136
+msgid "Posting destination"
+msgstr "અંતિમ મુકામ મોકલી રહ્યા છીએ"
+
+#: ../composer/e-composer-post-header.c:137
+msgid "Choose folders to post the message to."
+msgstr "સંદેશાઓ મોકલવા માટે ફોલ્ડર પસંદ કરો."
+
+#: ../composer/e-composer-post-header.c:171
+msgid "Click here to select folders to post to"
+msgstr "અંહિ પોસ્ટ કરવા માટે ફોલ્ડરો પસંદ કરો"
+
+#: ../composer/e-composer-private.c:65
+msgid "Recent _Documents"
+msgstr "તાજેતરનાં દસ્તાવેજો (_D)"
+
+#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+msgid "Show _Attachment Bar"
+msgstr "જોડાણ પટ્ટી બતાવો (_A)"
+
+#: ../composer/e-msg-composer.c:873
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "જતા સંદેશાઓની સહી કરી શકતા નથી: આ ખાતા માટે સહી કરવાનું કોઈ પ્રમાણપત્ર નથી"
 
-#: ../composer/e-msg-composer.c:826
+#: ../composer/e-msg-composer.c:880
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "જતા સંદેશાઓને એનક્રિપ્ટ કરી શકતા નથી: આ ખાતા માટે કોઈ એનક્રિપ્શન પ્રમાણપત્ર નથી"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
+#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1914
+#: ../mail/em-format-html-display.c:2404 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "જોડાણ"
+msgstr[1] "જોડાણો"
+
+#: ../composer/e-msg-composer.c:1557
 msgid "Hide _Attachment Bar"
 msgstr "જોડાણપટ્ટી છુપાવો (_A)"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3878
-msgid "Show _Attachment Bar"
-msgstr "જોડાણ પટ્ટી બતાવો (_A)"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "અજ્ઞાત કારણ"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "ફાઈલ ખોલી શક્યા નથી"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "સંપાદકમાંથી સંદેશો મેળવવા સમર્થ નથી"
-
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
-msgstr "શીર્ષક વગરનો સંદેશો"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "ફાઈલ ખોલો"
-
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3758
-#: ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
 msgid "Compose Message"
 msgstr "સંદેશો બનાવો"
 
-#: ../composer/e-msg-composer.c:5031
+#: ../composer/e-msg-composer.c:4056
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10241,8 +10850,7 @@ msgstr "શું તમે સંદેશો કાઢી નાંખવા �
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "કારણ &quot;{0}&quot;, તમારે અલગ મેઈલ વિકલ્પો પસંદ કરવાની જરુર છે."
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "કારણ કે &quot;{1}&quot;."
 
@@ -10353,23 +10961,27 @@ msgstr "તમે આ મદદપત્રિકામાં ફાઈલ `{0}'
 msgid "You need to configure an account before you can compose mail."
 msgstr "તમે મેઈલ કમ્પોઝ કરો તે પહેલા ખાતુ રુપરેખાંકિત કરવાની જરુર છે."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "ફેરફાર ચાલુ રાખો (_C)"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "પાછા મેળવો નહિં (_D)"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:312
+#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
 msgid "_Recover"
 msgstr "પાછા મેળવો (_R)"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "સંદેશો સંગ્રહો (_S)"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "ડ્રાફ્ટ સંગ્રહો (_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "ઈવોલ્યુશન મેઈલ અને કેલેન્ડર"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:672
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "ગ્રુપવેર સ્યુટ"
 
@@ -10385,55 +10997,78 @@ msgstr "સરનામા કાર્ડ"
 msgid "calendar information"
 msgstr "કેલેન્ડર જાણકારી"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "ઈવોલ્યુશન ભૂલ"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "ઈવોલ્યુશન ચેતવણી"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "ઈવોલ્યુશન જાણકારી"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "ઈવોલ્યુશન પ્રશ્ન"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "આંતરિક ભૂલ, અજ્ઞાત ભૂલ '%s' ની અરજી થઈ"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:154
+msgid "Component"
+msgstr "ઘટક"
+
+#: ../e-util/e-logger.c:155
+msgid "Name of the component being logged"
+msgstr "ઘટકનું નામ લોગ કરી દેવામાં આવ્યુ છે"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../plugins/plugin-manager/plugin-manager.c:339
+#: ../plugins/publish-calendar/publish-calendar.c:689
+msgid "Enabled"
+msgstr "સક્રિય કરેલ છે"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "શું પ્લગઇન સક્રિય થયેલ છે"
+
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "છાપતી વખતે ભૂલ ઉદ્ભવી"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "છાપન સિસ્ટમે ભૂલ વિશે નીચેની વિગતોનો અહેવાલ આપ્યો:"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:171
 msgid "The printing system did not report any additional details about the error."
 msgstr "છાપન સિસ્ટમ ભૂલ વિશે કોઈપણ વધારાની વિગતોનો અહેવાલ આપ્યો નથી."
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "કારણ કે \"{1}\"."
+
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "ફાઈલ ખોલી શકાતી નથી &quot;{0}&quot;."
+msgid "Cannot open file \"{0}\"."
+msgstr "ફાઈલ ખોલી શકાસે નહિં \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
-msgstr "ફાઈલ સંગ્રહી શકાતી નથી &quot;{0}&quot;."
+msgid "Cannot save file \"{0}\"."
+msgstr "ફાઈલ સંગ્રહી શકાતી નથી \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "શું તમે તેના પર ફરીથી લખવા માંગો છો?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
-msgstr "ફાઈલ હાજર છે &quot;{0}&quot;."
+msgid "File exists \"{0}\"."
+msgstr "ફાઈલ હાજર છે \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
@@ -10443,50 +11078,62 @@ msgstr "શું તેના ઉપર ફરીથી લખવું છે?
 msgid "_Overwrite"
 msgstr "ની ઉપર ફરીથી લખવું (_O)"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "મહત્વનું (_m)"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "કાર્ય (_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "ખાનગી (_W)"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "કરવાનું (_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "પછી (_L)"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "લેબલ નામ (_N):"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "લેબલમાં ફેરફાર કરો"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "લેબલ ઉમેરો"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "લેબલ નામ ખાલી રાખી શકાતું નથી."
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
+#: ../e-util/e-util-labels.c:356
+#, fuzzy
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
 msgstr "એ જ ટેગવાળું લેબલ પહેલાથી જ હાજર છે. તમારા લેબલનું નામ મહેરબાની કરીને બદલો."
 
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf ભૂલ: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "ટર્મિનલ પર ફક્ત બધી આગળની ભૂલો બતાવેલ છે."
+
 #: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
@@ -10603,65 +11250,65 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "ની સાથે સરખાવવા માટે સમય પસંદ કરો"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "ફાઈલ પસંદ કરો"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "ચકાસણી"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "નિયમ નામ (_u):"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "વસ્તુઓ શોધો કે જે નીચેની વિચારધારાને મળી આવે"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "ગાળક વિચારધારા ઉમેરો (_d)"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "જો બધી વિચારધારાઓ મળી જાય"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "જો કોઈ પણ વિચારધારા મળી જાય"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "વસ્તુઓ શોધો (_F):"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "બધું સંબંધિત"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "વળતા જવાબો"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "વળતા જવાબો અને પિતૃઓ"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "કોઈ પ્રત્યુત્તર અથવા પિતૃ નથી"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "થ્રેડો સમાવે છે (_n)"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "આવતા"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "જતા"
 
@@ -10685,7 +11332,7 @@ msgstr "ખોવાયેલ તારીખ."
 msgid "Missing file name."
 msgstr "ફાઈલ નામ ખોવાયેલ છે."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "નામ ખોવાયું છે."
 
@@ -10761,7 +11408,7 @@ msgstr "ભવિષ્યમાં"
 msgid "months"
 msgstr "મહિનાઓ"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "સેકન્ડો"
 
@@ -10773,9 +11420,9 @@ msgstr "વર્તમાન સમય"
 msgid "the time you specify"
 msgstr "તમે સ્પષ્ટ કરો એ સમય"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:404
 msgid "weeks"
 msgstr "અઠવાડિયાઓ"
 
@@ -10791,7 +11438,7 @@ msgstr "નિયમ ઉમેરો"
 msgid "Edit Rule"
 msgstr "નિયમમાં ફેરફાર કરો"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "નિયમનું નામ"
 
@@ -10812,57 +11459,69 @@ msgid "Configure your email accounts here"
 msgstr "તમારા ઈ-મેઈલ ખાતાઓ અંહિ રુપરેખાંકિત કરો"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "તમારા નેટવર્ક જોડાણ સુયોજનાઓ અંહિ રુપરેખાંકિત કરો"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "ઈવોલ્યુશન મેઈલ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr "ઈવોલ્યુશન મેઈલ ખાતાઓ રુપરેખાંકન નિયંત્રણ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "ઈવોલ્યુશન મેઈલ કમ્પોનન્ટ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "ઈવોલ્યુશન મેઈલ કમ્પોઝર"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr "ઈવોલ્યુશન મેઈલ કમ્પોઝર રુપરેખાંકન નિયંત્રણ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "ઈવોલ્યુશન મેઈલ પસંદગીઓ નિયંત્રણ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:575 ../mail/mail-component.c:576
-#: ../mail/mail-component.c:740
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Network configuration control"
+msgstr "ઈવોલ્યુશન નેટવર્ક રૂપરેખાંકન નિયંત્રણ"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../mail/mail-component.c:595 ../mail/mail-component.c:596
+#: ../mail/mail-component.c:760
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "મેઈલ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:502
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "મેઈલ ખાતાઓ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:102
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "મેઈલ પસંદગીઓ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "નેટવર્ક પસંદગીઓ"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "મેઈલ (_M)"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s લાઈસન્સ મંજૂરીપત્ર"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10875,115 +11534,109 @@ msgstr ""
 "%s માટે વાંચો કે જે નીચે પ્રદર્શિત છે\n"
 "અને તેને સ્વીકારવા માટે ચકાસણી બોક્સ ચિહ્નિત કરો\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "ફોલ્ડર પસંદ કરો"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:97
 msgid "Autogenerated"
 msgstr "આપોઆપ બનતુ"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "દરેક સંદેશા માટે પૂછો"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "ઓળખ"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "ઈ-મેઈલ મેળવી રહ્યા છીએ"
 
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "આ દરે નવા સંદેશાઓ માટે ચકાસો (_n)"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "મિનિટો (_t)"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "ઈ-મેઈલ મોકલી રહ્યા છીએ"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "મૂળભુતો"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "સુરક્ષા"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "વિકલ્પો મેળવી રહ્યા છીએ"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "નવા સંદેશાઓ માટે ચકાસી રહ્યા છીએ"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "ખાતા સંપાદક"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "ઈવોલ્યુશન ખાતા મદદનીશ"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[મૂળભુત]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "સક્રિય કરેલ છે"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "ખાતા નામ"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "પ્રોટોકોલ"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "નામ વિનાનું"
 
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "ભાષાઓ"
 
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "સહી સ્ક્રિપ્ટ ઉમેરો"
 
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "સહીઓ"
 
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- સંદેશો આગળ ધપાવો --------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "એક અજ્ઞાત મોકલનાર"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1750
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10991,11 +11644,11 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} પર ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} જગ્યાએ આ લખાયેલ હતું:"
 
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-----મૂળ સંદેશો-----"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "ગાળક નિયમો (_F)"
 
@@ -11012,10 +11665,6 @@ msgstr "રંગ નક્કી કરો"
 msgid "Assign Score"
 msgstr "સ્કોર નક્કી કરો"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "જોડાણો"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
@@ -11032,10 +11681,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "પર પૂર્ણ થયું"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "સમાવે છે"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "આ ફોલ્ડરમાં નકલ કરો"
@@ -11049,7 +11694,7 @@ msgid "Date sent"
 msgstr "મોકલ્યાની તારીખ"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11060,10 +11705,6 @@ msgstr "કાઢી નાખો"
 msgid "Deleted"
 msgstr "કાઢી નંખાયેલ છે"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "સમાવતું નથી"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "આની સાથે અંત થતો નથી"
@@ -11084,10 +11725,6 @@ msgstr "આના જેવું સંભળાતું નથી"
 msgid "does not start with"
 msgstr "ની સાથે શરુ થતું નથી"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "અસ્તિત્વમાં નથી"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "ડ્રાફ્ટ"
@@ -11096,10 +11733,6 @@ msgstr "ડ્રાફ્ટ"
 msgid "ends with"
 msgstr "ની સાથે અંત થાય છે"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "હાજર છે"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "હાજર છે"
@@ -11112,14 +11745,10 @@ msgstr "સમીકરણ"
 msgid "Follow Up"
 msgstr "ને અનુસરો"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "મહત્વનું"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "છે"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "એ પછી"
@@ -11132,18 +11761,6 @@ msgstr "એ પહેલા"
 msgid "is Flagged"
 msgstr "એ નિશાનિત છે"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "ના કરતાં મોટું છે"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "ના કરતાં નાનું છે"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "એ નથી"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "એ નિશાનિત નથી"
@@ -11156,7 +11773,7 @@ msgstr "એ સુયોજીત નથી"
 msgid "is set"
 msgstr "એ સુયોજીત છે"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "નકામુ"
@@ -11165,7 +11782,7 @@ msgstr "નકામુ"
 msgid "Junk Test"
 msgstr "બગડેલ ચકાસણી"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "લેબલ"
 
@@ -11207,7 +11824,7 @@ msgstr "ધ્વનિ વગાડો"
 
 #. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "વાંચો"
 
@@ -11279,10 +11896,9 @@ msgstr "ની સાથે શરુ થાય છે"
 msgid "Stop Processing"
 msgstr "પ્રક્રિયા કરવાનું બંધ કરો"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:318
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11293,11 +11909,11 @@ msgid "Unset Status"
 msgstr "સ્થિતિ અસુયોજિત કરો"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "પછી"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "ક્રિયા ઉમેરો (_t)"
 
@@ -11341,16 +11957,16 @@ msgstr "મહત્વના સંદેશાઓ"
 msgid "Messages Not Junk"
 msgstr "સંદેશાઓ બગડેલ નથી"
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "ખાતા શોધ"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "બધા ખાતા શોધ"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:173
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "નહિં વાંચેલ સંદેશાઓ:"
@@ -11358,31 +11974,45 @@ msgstr[1] "નહિં વાંચેલ સંદેશાઓ:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:177
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "કુલ સંદેશાઓ:"
 msgstr[1] "કુલ સંદેશાઓ:"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+msgid "Quota usage"
+msgstr "ક્વોટા વપરાશ"
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
+#: ../mail/mail-component.c:583
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
+msgid "Inbox"
+msgstr "ઈનબોક્સ"
+
+#: ../mail/em-folder-properties.c:386
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "ફોલ્ડરના ગુણધર્મો"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "&lt;ફોલ્ડર પસંદ કરવા માટે અંહિ ક્લિક કરો&gt;"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "બનાવો (_r)"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "ફોલ્ડર નામ (_n):"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "શોધ ફોલ્ડરો"
 
@@ -11391,27 +12021,19 @@ msgstr "શોધ ફોલ્ડરો"
 msgid "UNMATCHED"
 msgstr "નહિં બંધબેસેલા"
 
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "ડ્રાફ્ટો"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
-#: ../mail/mail-component.c:156
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "ઈનબોક્સ"
-
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "આઉટબોક્સ"
 
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "મોકલાયેલ"
 
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "લાવી રહ્યા છીએ..."
 
@@ -11430,86 +12052,79 @@ msgstr "લાવી રહ્યા છીએ..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:372
+#: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "મેઈલ ફોલ્ડર વૃક્ષ"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "ફોલ્ડર %s ખસેડી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "ફોલ્ડર %s નકલ કરી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "સંદેશાઓ ફોલ્ડર %s માં ખસેડી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "સંદેશાઓ ફોલ્ડર %s માં નકલ કરી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ઉચ્ચ સ્તરના સંગ્રહસ્થાનમાં સંદેશાઓ મૂકી શકતા નથી"
 
-#: ../mail/em-folder-tree.c:1011 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "આ ફોલ્ડરમાં નકલ કરો (_C)"
 
-#: ../mail/em-folder-tree.c:1012 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "આ ફોલ્ડરમાં ખસેડો (_M)"
 
-#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" માં ફોલ્ડરો ચકાસી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "દેખાવ (_V)"
-
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "નવી વિન્ડોમાં ખોલો (_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "નવું ફોલ્ડર (_N)..."
 
-#: ../mail/em-folder-tree.c:2103
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "ખસેડો (_M)..."
 
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "નામ બદલો (_R)..."
 
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "પુનઃતાજું કરો (_f)"
 
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "આઉટબોક્સ ફ્લશ કરો (_u)"
 
-#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "કચરાપેટી ખાલી કરો (_E)"
 
@@ -11518,13 +12133,13 @@ msgstr "કચરાપેટી ખાલી કરો (_E)"
 msgid "Copying `%s' to `%s'"
 msgstr "`%s' ને `%s' માં નકલ કરી રહ્યા છીએ"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "ફોલ્ડર પસંદ કરો"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
 msgid "C_opy"
 msgstr "નકલ કરો (_o)"
 
@@ -11546,267 +12161,259 @@ msgstr "ફોલ્ડર બનાવો"
 msgid "Specify where to create the folder:"
 msgstr "સ્પષ્ટ કરો કે ક્યાં ફોલ્ડર બનાવવું છે:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "મેઈલ કાઢવામાં નિષ્ફળ"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "આ મેઈલ કાઢવા માટે તમારી પાસે પૂરતી પરવાનગીઓ નથી."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "મોકલનારને વળતો જવાબ આપો (_R)"
 
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:578 ../mail/em-popup.c:589
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "આગળ ધપાવો (_F)"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "નવા સંદેશાઓમાં ફેરફાર કરો (_E)..."
 
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "છાપો (_P)..."
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1348
 msgid "U_ndelete"
 msgstr "કાઢી નંહિ (_n)"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1349
 msgid "_Move to Folder..."
 msgstr "ફોલ્ડરમાં ખસેડો (_M)..."
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1350
 msgid "_Copy to Folder..."
 msgstr "આ ફોલ્ડરમાં નકલ કરો (_C)..."
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1353
 msgid "Mar_k as Read"
 msgstr "વાંચ્યુ હોય એમ નિશાનિત કરો (_k)"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Unread"
 msgstr "નહિં વાંચેલ છે એમ ચિહ્નિત કરો (_U)"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Important"
 msgstr "મહત્વનું એમ નિશાનિત કરો (_I)"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as Un_important"
 msgstr "મહત્વનું નથી એમ નિશાનિત કરો (_i)"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Junk"
 msgstr "બગડેલ છે એમ નિશાનિત કરો (_J)"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as _Not Junk"
 msgstr "બગડેલ નથી એમ નિશાનિત કરો (_N)"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1359
 msgid "Mark for Follo_w Up..."
 msgstr "અનુસરણ માટેનું ચિહ્ન (_w)..."
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1361
 msgid "_Label"
 msgstr "લેબલ (_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "કંઈ નહિં (_N)"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1365
 msgid "_New Label"
 msgstr "નવું લેબલ (_N)"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1369
 msgid "Fla_g Completed"
 msgstr "નિશાની પૂર્ણ થયેલ છે (_g)"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1370
 msgid "Cl_ear Flag"
 msgstr "નિશાની સાફ કરો (_e)"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1373
 msgid "Crea_te Rule From Message"
 msgstr "સંદેશામાંથી નિયમ બનાવો (_t)"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1375
 msgid "Search Folder based on _Subject"
 msgstr "વિષય પર આધાર રાખીને ફોલ્ડર શોધો (_S)"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1376
 msgid "Search Folder based on Se_nder"
 msgstr "મોકલનાર પર આધાર રાખીને ફોલ્ડરમાં શોધો (_n)"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1377
 msgid "Search Folder based on _Recipients"
 msgstr "મેળવનારાઓ પર આધાર રાખીને ફોલ્ડરમાં શોધો (_R)"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1378
 msgid "Search Folder based on Mailing _List"
 msgstr "મેઈલિંગ લીસ્ટ પર આધાર રાખીને ફોલ્ડરમાં શોધો (_L)"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1383
 msgid "Filter based on Sub_ject"
 msgstr "વિષય આધારિત ગાળણ (_j)"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1384
 msgid "Filter based on Sen_der"
 msgstr "મોકલનાર આધારિત ગાળણ (_d)"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1385
 msgid "Filter based on Re_cipients"
 msgstr "મેળવનાર આધારિત ગાળણ (_c)"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1386
 msgid "Filter based on _Mailing List"
 msgstr "મેઈલિંગ લીસ્ટ આધારિત ગાળણ (_M)"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
 msgid "Default"
 msgstr "મૂળભુત"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "સંદેશો પાછો મેળવવા સમર્થ નથી"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "સંદેશો પુનઃપ્રાપ્ત કરી રહ્યા છીએ..."
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "ને કોલ કરો (_a)..."
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
 msgstr "શોધ ફોલ્ડર બનાવો (_S)"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "આ સરનામા તરફથી (_F)"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "આ સરનામા પ્રતિ (_T)"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "મેઈલ %s કરવા માટે ક્લિક કરો"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "%s ને કોલ કરવા માટે ક્લિક કરો"
 
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "સંદેશાઓ છુપાવવા/બતાવવા ક્લિક કરો"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:472
 #, c-format
 msgid "Matches: %d"
 msgstr "બંધબેસતા: %d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:616
 msgid "Fin_d:"
 msgstr "શોધો (_d):"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:640
 msgid "_Previous"
 msgstr "પાછળ (_P)"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:645
 msgid "_Next"
 msgstr "આગળ (_N)"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:650
 msgid "M_atch case"
 msgstr "જોડણી સરખાવો (_a)"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "સહી કરેલ નથી"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "સંદેશો સહી કરેલ નથી. સંદેશો યોગ્ય હોય એની કોઈ ગેરંટી નથી."
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "માન્ય સહી"
 
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "આ સંદેશો સહી થયેલ છે અને એ માન્ય છે એટલે કે એ ખૂબ જરુરી છે કે આ સંદેશો વ્યવસ્થિત છે."
 
-#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "અયોગ્ય સહી"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "આ સંદેશાની આ સહી ચકાસાયેલ નથી, તે પરિવહન દરમ્યાન બદલી દેવાયેલ છે."
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "માન્ય સહી, પરંતુ મોકલનારને ચકાસી શકતા નથી"
 
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "આ સંદેશો માન્ય સહી સાથે સહી કરાયેલ છે, પરંતુ સંદેશાનો મોકલનાર ચકાસી શકાતો નથી."
 
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "સહી અસ્તિત્વમાં છે, પરંતુ જાહેર કી જરૂરી"
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:953
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "આ સંદેશો સહી સાથે સહી કરાયેલ છે, પરંતુ ત્યાં કોઈ લાગતીવળગતી જાહેર કી નથી."
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "એનક્રિપ્ટ થયેલ નથી"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "સંદેશો એનક્રિપ્ટ થયેલ નથી. તેના સમાવિષ્ટો ઈન્ટરનેટ પર પરિવહન દરમ્યાન દેખાઈ શકે છે."
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "એનક્રિપ્ટ થયેલ, નબળુ"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:961
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11815,21 +12422,21 @@ msgstr ""
 "આ સંદેશો એનક્રિપ્ટ થયેલ છે, પરંતુ નબળા એનક્રિપ્શન અલગોરિધમ સાથે. તે મુશ્કેલ હશે, પરંતુ એ "
 "બહારના વ્યક્તિ માટે પ્રાયોગિક સમય દરમ્યાન સંદેશાના સમાવિષ્ટો જોવાનું અશક્ય નથી."
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "એનક્રિપ્ટ થયેલ"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:962
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "સંદેશો એનક્રિપ્ટ થયેલ છે. બહારની વ્યક્તિ માટે આ સંદેશાના સમાવિષ્ટોને જોવાનું મુશ્કેલ થઈ જશે."
 
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "એનક્રિપ્ટ થયેલ, મજબૂત"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:963
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11838,94 +12445,90 @@ msgstr ""
 "આ સંદેશો એનક્રિપ્ટ થયેલ છે, મજબૂત એનક્રિપ્શન અલગોરિધમ સાથે. બહારની વ્યક્તિ માટે પ્રાયોગિક "
 "સમય દરમ્યાન આ સંદેશાના સમાવિષ્ટોને જોવાનું મુશ્કેલ થઈ જશે."
 
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1064 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "પ્રમાણપત્ર જુઓ (_V)"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1079
 msgid "This certificate is not viewable"
 msgstr "આ પ્રમાણપત્ર જોઈ શકાય એમ નથી"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1372
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p પૂર્ણ થઈ જશે"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1380
 msgid "Overdue:"
 msgstr "ઈચ્છિત સમયે નહિં થયેલ કાર્ય:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1383
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p દ્વારા"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1461
 msgid "_View Inline"
 msgstr "લીટીમાં જુઓ (_V)"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1462
 msgid "_Hide"
 msgstr "છુપાવો (_H)"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1463
 msgid "_Fit to Width"
 msgstr "પહોળાઈમાં બંધબેસાડો (_F)"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1464
 msgid "Show _Original Size"
 msgstr "મૂળ માપ બતાવો (_O)"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "જોડાણ"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1984
 msgid "Save attachment as"
 msgstr "જોડાણ આ રીતે સંગ્રહો"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1988
 msgid "Select folder to save all attachments"
 msgstr "બધા જોડાણો સંગ્રહવા માટે ફોલ્ડર પસંદ કરો"
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2039
 msgid "_Save Selected..."
 msgstr "પસંદિત સંગ્રહો (_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2106
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d જોડાણ (_t)"
 msgstr[1] "%d જોડાણો (_t)"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2113 ../mail/em-format-html-display.c:2202
 msgid "S_ave"
 msgstr "સંગ્રહો (_a)"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2124
 msgid "S_ave All"
 msgstr "બધું સંગ્રહો (_a)"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2198
 msgid "No Attachment"
 msgstr "કોઈ જોડાણ નથી"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2339 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "બંધારણવિનાનું જુઓ (_U)"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2341
 msgid "Hide _Unformatted"
 msgstr "બંધારણવિનાનું છુપાવો (_U)"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2396
 msgid "O_pen With"
 msgstr "ની સાથે ખોલો (_p)"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2467
+#, fuzzy
 msgid ""
-"Evolution cannot render this email as it is too large to handle. You can "
+"Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
 "ઈવોલ્યુશન આ ઈમેઈલ રેન્ડર કરી શકતો નથી કારણ કે તે સંભાળવા માટે ખૂબ મોટો છે. તમે તેને "
@@ -11936,274 +12539,289 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "પાનુ %d %d નું"
 
-#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s' મેળવી રહ્યા છીએ"
 
-#: ../mail/em-format-html.c:916
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "અજ્ઞાત બાહ્ય-શરીર ભાગ."
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "બાહ્ય ભાગનો કદરુપો ભાગ."
 
-#: ../mail/em-format-html.c:954
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP સાઈટ (%s) નો નિર્દેશક"
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "સ્થાનિક ફાઈલ (%s) નો નિર્દેશક સાઈટ \"%s\" માન્ય છે"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "સ્થાનિક ફાઈલ (%s) નો નિર્દેશક"
 
-#: ../mail/em-format-html.c:988
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "દૂરસ્થા માહિતી (%s) નો નિર્દેશક"
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "અજ્ઞાત બાહ્ય માહિતી (\"%s\" પ્રકારની) નો નિર્દેશક"
 
-#: ../mail/em-format-html.c:1227
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "સંદેસાનું બંધારણ ઘડી રહ્યા છીએ"
 
-#: ../mail/em-format-html.c:1394
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "સંદેસાનું બંધારણ ઘડી રહ્યા છીએ..."
 
-#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "ને પણ"
 
-#: ../mail/em-format-html.c:1547 ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "આને પણ ખબર વિના"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "મેઈલ મોકલનાર"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1733
+#: ../mail/em-format-html.c:1771
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1738
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "તારીખ"
-
-#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-msgid "Newsgroups"
-msgstr "સમાચાર જૂથો"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1866
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "આ સંદેશો <b>%s</b> દ્વારા <b>%s</b> વતી મોકલાયેલ હતો"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:314
 msgid "From"
 msgstr "તરફથી"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "ને જવાબ આપો"
 
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
+#: ../widgets/misc/e-dateedit.c:353
+msgid "Date"
+msgstr "તારીખ"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "સમાચાર જૂથો"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s જોડાણ"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME સંદેશાનું પદચ્છેદ કરી શક્યા નહિં: અજ્ઞાત ભૂલ"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME સંદેસાનું પદચ્છેદ કરી શક્યા નહિં. સ્રોત તરીકે બતાવી રહ્યા છીએ."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "multipart/encrypted માટે આધારભૂત નહિં એવો એનક્રિપ્શન પ્રકાર"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME સંદેશાનું પદચ્છેદન કરી શક્યા નહિં"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME સંદેશાનું પદચ્છેદન કરી શક્યા નહિં: અજ્ઞાત ભૂલ"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "સહીનું બંધારણ આધારભૂત નથી"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "સહી ચકાસણીમાં ભૂલ"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "સહી ચકાસણી કરતી વખતે અજ્ઞાત ભૂલ"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "PGP સંદેશાનું પદચ્છેદન કરી શક્યા નહિં"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP સંદેશાનું પદચ્છેદન કરી શક્યા નહિં: અજ્ઞાત ભૂલ"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "દર વખતે"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "દિવસમાં એક વાર"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "અઠવાડિયામાં એક વાર"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "મહિનામાં એક વાર"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "વૈવિધ્યપૂર્ણ બગડેલ હેડર ઉમેરો"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "હેડર નામ:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "હેડર કિંમત આ બધું સમાવે છે:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "કિંમત સમાવે છે"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "રંગ"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "ટેગ"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s પ્લગઈન ઉપલબ્ધ છે અને બાઈનરી સ્થાપિત થયેલ છે."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s પ્લગઈન ઉપલબ્ધ નથી. મહેરબાની કરીને ચકાસો કે શું પેકેજ સ્થાપિત થયેલ છે."
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "કોઈ બગડેલ પ્લગઈન ઉપલબ્ધ નથી"
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "કરવાનું"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "પછી"
 
-#: ../mail/em-migrate.c:1211
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"ઈવોલ્યુશન 1.x આવ્યું ત્યારથી ઈવોલ્યુશન મેઈલબોક્સ ફોલ્ડરોની જગ્યા અને વંશવેલો બદલાઈ ગયો.\n"
-"\n"
-"મહેરબાની કરીને ઈવોલ્યુશન તમારા ફોલ્ડરોને ફેરવે ત્યાં સુધી શાંતિ દાખવો..."
+#: ../mail/em-migrate.c:1247
+#, c-format
+msgid "Migrating '%s':"
+msgstr "`%s' ને એક જગ્યાએથી બીજી જગ્યાએ લઇ રહ્યા છે:"
 
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "નવું ફોલ્ડર `%s' બનાવવામાં સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "ફોલ્ડર `%s' ને `%s' માં નકલ કરવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "વર્તમાન મેઈલબોક્સને `%s' આગળ ચકાસવા માટે સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../mail/em-migrate.c:1868
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"ઈવોલ્યુશન 1.x આવ્યું ત્યારથી ઈવોલ્યુશન મેઈલબોક્સ ફોલ્ડરોની જગ્યા અને વંશવેલો બદલાઈ ગયો.\n"
+"\n"
+"મહેરબાની કરીને ઈવોલ્યુશન તમારા ફોલ્ડરોને ફેરવે ત્યાં સુધી શાંતિ દાખવો..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "જૂની POP keep-on-server માહિતી `%s' ખોલવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "POP3 keep-on-server માહિતી ડિરેક્ટરી `%s' બનાવવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 keep-on-server માહિતી `%s' નકલ કરવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "સ્થાનિક મેઈલ સંગ્રહસ્થાન `%s' બનાવવામાં નિષ્ફળ: %s"
 
-#: ../mail/em-migrate.c:2827
+#: ../mail/em-migrate.c:2898
+#, fuzzy
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"ઈવોલ્યુશન 1.x આવ્યું ત્યારથી ઈવોલ્યુશન મેઈલબોક્સ ફોલ્ડરોની જગ્યા અને વંશવેલો બદલાઈ ગયો.\n"
+"\n"
+"મહેરબાની કરીને ઈવોલ્યુશન તમારા ફોલ્ડરોને ફેરવે ત્યાં સુધી શાંતિ દાખવો..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "`%s' જગ્યાએ સ્થાનિક મેઈલ ફોલ્ડરો બનાવવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2846
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12211,62 +12829,65 @@ msgstr ""
 "પહેલાના ઈવોલ્યુશનના સ્થાપનમાંથી સુયોજનો વાંચવા સમર્થ નથી, `evolution/config.xmldb' "
 "અસ્તિત્વમાં નથી અથવા બગડેલ છે."
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 msgid "_Reply to sender"
 msgstr "મોકલનારને જવાબ આપો (_R)"
 
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "યાદીને જવાબ આપો (_L)"
 
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
 msgid "_Add to Address Book"
 msgstr "સરનામા પુસ્તિકામાં ઉમેરો (_A)"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "આ સ્ટોર ઉમેદવારીને આધાર આપતી નથી, અથવા તેઓ સક્રિય નથી."
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "ઉમેદવારી"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "ફોલ્ડર"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "મહેરબાની કરીને સર્વર પસંદ કરો."
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "કોઈ સર્વર પસંદ થયેલ નથી"
 
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "આ સંદેશો ફરીથી બતાવશો નહિં (_D)."
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "સંદેશા ગાળકો"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "સંદેશો"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "સંદેશો સંગ્રહો..."
 
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "સરનામુ ઉમેરો"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "%s માંથી સંદેશાઓ"
@@ -12280,189 +12901,237 @@ msgid "Search Folder source"
 msgstr "ફોલ્ડર સ્રોત શોધો"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "\"મેઈલ મોકલો અને મેળવો\" વિન્ડો ઊંચાઇ"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "\"મેઈલ મોકલો અને મેળવો\" વિન્ડો મહત્તમ સ્ટેટ"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Send and Receive Mail\" window width"
+msgstr "\"મેઈલ મોકલો અને મેળવો\" વિન્ડો પહોળાઇ"
+
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
 msgstr "ઈવોલ્યુશનને મર્યાદિત માપનો લખાણ ભાગ દર્શાવવા માટે પરવાનગી આપે છે"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "હંમેશા વાંચન રસીદની અરજી કરો"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "પરિસ્થિતિદર્શક પટ્ટી પર ભૂલ બતાવવામાં આવવી જોઈએ તે સમયનો જથ્થો સેકન્ડોમાં."
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "આપોઆપ ચિહ્ન ઓળખ"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "આપોઆપ કડી ઓળખો"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "આવતા મેઈલોને બગડેલા છે કે નહિં તે ચકાસો"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "સાઈટનો પ્રકાશક રંગ"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "સાઈટનો પ્રકાશક રંગ."
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "કમ્પોઝર વિન્ડોની મૂળભુત ઊંચાઈ"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "કમ્પોઝર વિન્ડોની મૂળભુત પહોળાઈ"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "કમ્પોઝર ભાર/ડિરેક્ટરી જોડો"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "સરનામાઓનું દૃશ્ય TO/CC/BCC માં સંકુચિત કરે છે"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "સરનામાઓનું દૃશ્ય TO/CC/BCC માં address_count માં સ્પષ્ટ થયેલ નંબર પ્રમાણે સંકુચિત કરે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:18
+#, fuzzy
+msgid "Custom headers to use while checking for junk."
+msgstr "બગડેલ માટે ચકાસવા માટેની હેડર સ્પષ્ટ કરે છે."
+
+#: ../mail/evolution-mail.schemas.in.h:19
+#, fuzzy
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr "બગડેલ માટે ચકાસવા માટેની હેડર સ્પષ્ટ કરે છે. gconf માં headername=value બંધારણ છે."
+
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "અક્ષરોનો મૂળભુત સમૂહ કે જેમાં સંદેશાઓ બનાવવાના છે"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "અક્ષરોનો મૂળભુત સમૂહ કે જેમાં સંદેશાઓ બનાવવાના છે."
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "અક્ષરોનો મૂળભુત સમૂહ કે જેમાં સંદેશાઓ બતાવવાના છે"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "અક્ષરોનો મૂળભુત સમૂહ કે જેમાં સંદેશાઓ બતાવવાના છે."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "મૂળભુત આગળ ધપાવવાની શૈલી"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "કમ્પોઝર વિન્ડોની મૂળભૂત ઊંચાઈ."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "સંદેશા વિન્ડોની મૂળભૂત ઊંચાઈ."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "ઉમેદવારી સંવાદની મૂળભૂત ઊંચાઈ."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "વળતા જવાબની મૂળભુત શૈલી"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "થ્રેડ વિસ્તરણ સ્થિતિ માટે મૂળભૂત કિંમત"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "કમ્પોઝર વિન્ડોની મૂળભૂત પહોળાઈ."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "સંદેશા વિન્ડોની મૂળભૂત પહોળાઈ."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "ઉમેદવારી સંવાદની મૂળભૂત પહોળાઈ."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:33
+#, fuzzy
+msgid ""
+"Determines whether to look up addresses for junk filtering in local "
+"addressbook only"
+msgstr "નક્કી કરે છે કે શું મોકલનાર ઈમેઈલ માટે સરનામાપુસ્તિકામાં જોવું કે નહિં"
+
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr "નક્કી કરે છે કે શું મોકલનાર ઈમેઈલ માટે સરનામાપુસ્તિકામાં જોવું કે નહિં"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
 "can be slow, if remote addressbooks (like ldap) are marked for "
 "autocompletion."
-msgstr "નક્કી કરે છે કે શું સરનામાપુસ્તિકામાં મોકલનારનું સરનામું જોવું. જો મળે, તો તે સ્પામ નહિં હોવું જોઈએ. તે આપોઆપસમાપ્તિ માટે ચિહ્નિત થયેલ પુસ્તિકાઓમાં જુએ છે. તે ધીમું હોઈ શકે, જો દૂરસ્થ સરનામાપુસ્તિકાઓ (જેમ કે ldap) આપોઆપસમાપ્તિ માટે ચિહ્નિત થયેલ હોય."
+msgstr ""
+"નક્કી કરે છે કે શું સરનામાપુસ્તિકામાં મોકલનારનું સરનામું જોવું. જો મળે, તો તે સ્પામ નહિં હોવું "
+"જોઈએ. તે આપોઆપસમાપ્તિ માટે ચિહ્નિત થયેલ પુસ્તિકાઓમાં જુએ છે. તે ધીમું હોઈ શકે, જો દૂરસ્થ "
+"સરનામાપુસ્તિકાઓ (જેમ કે ldap) આપોઆપસમાપ્તિ માટે ચિહ્નિત થયેલ હોય."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "નક્કી કરે છે કે શું બગડેલ માટે વૈવિધ્યપૂર્ણ હેડરો વાપરવી"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
-msgstr "નક્કી કરે છે કે શું બગડેલ માટે ચકાસણી કરવા વૈવિધ્યપૂર્ણ હેડરો વાપરવી. જો આ વિકલ્પ સક્રિય કરેલ હોય અને હેડરો સૂચવેલ હોય, તો તે બગડેલ ચકાસણીની ઝડપ સુધારશે."
+msgstr ""
+"નક્કી કરે છે કે શું બગડેલ માટે ચકાસણી કરવા વૈવિધ્યપૂર્ણ હેડરો વાપરવી. જો આ વિકલ્પ સક્રિય "
+"કરેલ હોય અને હેડરો સૂચવેલ હોય, તો તે બગડેલ ચકાસણીની ઝડપ સુધારશે."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
-msgstr "\"સંદેશાઓ\" સ્તંભમાં ઊભા દેખાવમાં \"તરફથી\" અને \"વિષય\" બંને વાક્યો માટે શું એક જ ફોન્ટ વાપરવા કે નહિં તે નક્કી કરે છે."
+msgstr ""
+"\"સંદેશાઓ\" સ્તંભમાં ઊભા દેખાવમાં \"તરફથી\" અને \"વિષય\" બંને વાક્યો માટે શું એક જ ફોન્ટ "
+"વાપરવા કે નહિં તે નક્કી કરે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "કમ્પોઝરમાં ફાઈલો લાવવા/જોડવા માટેની ડિરેક્ટરી."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "મેઈલ કમ્પોનન્ટ ફાઈલો સાચવવા માટેની ડિરેક્ટરી."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "તમે ટાઈપ કરો તે શબ્દ પર જોડણઈ ભૂલ સૂચવનારાઓ દોરો."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "બહાર નીકળવા પર બગડેલ ફોલ્ડરો ખાલી કરો"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "ખાલી કચરાપેટી ફોલ્ડરો અસ્તિત્વમાં નથી"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "જ્યારે ઈવોલ્યુશન બંધ કરી રહ્યા હોય ત્યારે બધા બગડેલ ફોલ્ડરો ખાલી કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "ઈવોલ્યુશનમાંથી બહાર નીકળો ત્યારે બધા કચરાપેટી ફોલ્ડરો ખાલી કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "કેરેટ સ્થિતિ સક્રિય કરો, કે જેથી તમે મેઈલ વાંચતી વખતે કર્સર જોઈ શકો."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "જાદુઈ જગ્યા પટ્ટી સક્રિય કે નિષ્ક્રિય કરો"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "શોધ લક્ષણ આગળ સક્રિય કરો અથવા નિષ્ક્રિય કરો પ્રકાર"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "શોધ ફોલ્ડરો સક્રિય કરો"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "શરૂઆતમાં શોધ ફોલ્ડરો સક્રિય કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12473,33 +13142,35 @@ msgstr ""
 "વપરાશ એ છે કે તમે સરળતાથી ફોલ્ડર શોધી શકો છો તે બાજુ પટ્ટીમાં ખાલી ફોલ્ડરનું નામ લખીને "
 "અને પસંદગી આપોઆપ તે ફોલ્ડરમાં કૂદી પડે."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
-msgstr "સંદેશા પૂર્વદર્શન, સંદેશા યાદી અને ફોલ્ડરોમાં સરકાવવા માટે જગ્યા પટ્ટી કી વાપરવા માટે આને સક્રિય કરો."
+msgstr ""
+"સંદેશા પૂર્વદર્શન, સંદેશા યાદી અને ફોલ્ડરોમાં સરકાવવા માટે જગ્યા પટ્ટી કી વાપરવા માટે આને "
+"સક્રિય કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "મર્યાદિત માપનો સંદેશા લખાણ ભાગ રેન્ડર કરવાનું સક્રિય કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "કેરેટ સ્થિતિ સક્રિય/નિષ્ક્રિય કરો"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "સંદેશા યાદી તકતીની ઊંચાઈ"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "સંદેશા-યાદી તકતીની ઊંચાઈ."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "ફોલ્ડર-પ્રતિ પૂર્વદર્શન છુપાવે છે અને પસંદગી દૂર કરે છે"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12507,13 +13178,13 @@ msgstr ""
 "જો વપરાશકર્તા ૧૦ અથવા વધુ સંદેશાઓ એક જ સમયે ખોલવાનો પ્રયત્ન કરે, તો જો વપરાશકર્તા "
 "ખરેખર ઈચ્છા ધરાવતો હોય તો તેને પૂછો."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 msgstr "જો \"પૂર્વદર્શન\" તકતી ચાલુ હોય, તો પછી તેને ઊભું દર્શાવવાની જગ્યાએ બાજુ-પછી-બાજુ દર્શાવો."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12522,48 +13193,74 @@ msgstr ""
 "જો ત્યાં કોઈ આંતરિક દર્શક કોઈ ચોક્કસ પ્રકારના mime કે જે ઈવોલ્યુશનની અંદર હોય, અને કોઈ "
 "પ્રકારના mime."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:64
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "તે ઘણા સંદેશાઓને ચિહ્નિત કરતી વખતે પ્રોમ્પ્ટ સક્રિય/નિષ્ક્રિય કરે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
-msgstr "તે પુનરાવર્તિ પ્રોમ્પ્ટને પૂછવાનું નિષ્ક્રિય/સક્રિય કરે છે જો ઓફલાઈન સુમેળ જરૂરી હોય ઓફલાઈન સ્થિતિમાં જવા પહેલાં."
+msgstr ""
+"તે પુનરાવર્તિ પ્રોમ્પ્ટને પૂછવાનું નિષ્ક્રિય/સક્રિય કરે છે જો ઓફલાઈન સુમેળ જરૂરી હોય ઓફલાઈન "
+"સ્થિતિમાં જવા પહેલાં."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
-msgstr "સંદેશાઓને શોધ ફોલ્ડરમાંથી કાઢી નાંખવાનું સંદેશાને કાયમી રીતે કાઢી નાંખે છે એ ચેતવણી આપવા માટે તે પુનરાવર્તિ પ્રોમ્પ્ટને પૂછવાનું નિષ્ક્રિય/સક્રિય કરે છે, તેને શોધ પરિણામોમાંથી ખાલી દૂર કરીને નહિં."
+msgstr ""
+"સંદેશાઓને શોધ ફોલ્ડરમાંથી કાઢી નાંખવાનું સંદેશાને કાયમી રીતે કાઢી નાંખે છે એ ચેતવણી આપવા માટે "
+"તે પુનરાવર્તિ પ્રોમ્પ્ટને પૂછવાનું નિષ્ક્રિય/સક્રિય કરે છે, તેને શોધ પરિણામોમાંથી ખાલી દૂર કરીને "
+"નહિં."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "છેલ્લા સમયે બગડેલ ખાલી કરો ચાલ્યું હતું"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "છેલ્લી વખતે ખાલી કચરાપેટી ચાલી હતી"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "સંદેશાઓ લોગ થવા જોઈએ તેની બહારનું સ્તર."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "લેબલો અને તેની સાથે સંકળાયેલ રંગોની યાદી"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "સ્વીકાર્ય લાઈસન્સોની યાદી"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "ખાતાઓની યાદી"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12571,11 +13268,15 @@ msgstr ""
 "ઈવોલ્યુશનના મેઈલ કમ્પોનન્ટ માટે જાણીતા ખાતાઓની યાદી. યાદી શબ્દમાળા ધરાવે છે જે /apps/"
 "evolution/mail/accounts ની ઉપડિરેક્ટરીને અનુલક્ષે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "કસ્ટમ હેડરોની યાદી અને શું તેઓ સક્રિય છે."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12583,122 +13284,126 @@ msgstr ""
 "ઈવોલ્યુશનના મેઈલ ભાગને જાણતા લેબલોની યાદી. યાદી શબ્દમાળાઓ ધરાવે છે જે નામ:રંગ ધરાવે છે કે "
 "જ્યાં રંગો HTML હેક્ઝ સંગ્રહપદ્ધતિ વાપરે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "બોનોબો કમ્પોનન્ટ દર્શકોની ચકાસણી માટે mime પ્રકારોની યાદી"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "પ્રોટોકોલ નામોની યાદી કે જેઓનું લાઈસન્સ સ્વીકારાયેલ છે."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "HTML સંદેશાઓ માટે http ની ઉપર ચિત્રો લાવો"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:81
+#, fuzzy
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net. 1 - Load images in messages from contacts. 2 - "
-"Always load images off the net."
-msgstr "http(s) ઉપર HTML સંદેશાઓ માટે ચિત્રો લાવો. આ શક્ય કિંમતો છે: ૦ - નેટની બહાર ક્યારેય ચિત્રો લાવો નહિં. ૧ - સંપર્કોમાંથી સંદેશાઓમાં ચિત્રો લાવો. ૩ - હંમેશા નેટની બહાર ચિત્રો લાવો."
+"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
+msgstr ""
+"http(s) ઉપર HTML સંદેશાઓ માટે ચિત્રો લાવો. આ શક્ય કિંમતો છે: ૦ - નેટની બહાર ક્યારેય "
+"ચિત્રો લાવો નહિં. ૧ - સંપર્કોમાંથી સંદેશાઓમાં ચિત્રો લાવો. ૩ - હંમેશા નેટની બહાર ચિત્રો "
+"લાવો."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "ગાળકની ક્રિયાઓનો લોગ"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "ગાળકની ક્રિયાઓનો લોગ કોઈ સ્પષ્ટ કરેલ લોગ ફાઈલમાં કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "ગાળકની ક્રિયાઓનો લોગ માટેની લોગ ફાઈલ"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "ગાળકની ક્રિયાઓનો લોગ માટેની લોગ ફાઈલ."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "સ્પષ્ટ કરેલ સમય સમાપ્ત થાય પછી જોયું છે એમ ચિહ્નિત કરો"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "સ્પષ્ટ કરેલ સમય પછી જોયું હોય એમ ચિહ્નિત કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "સંદેશા \"પૂર્વદર્શન\" માં સાઈટ બનાવવાનું ચિહ્નિત કરો"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "સંદેશા \"પૂર્વદર્શન\" માં સાઈટ બનાવવાનું ચિહ્નિત કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "સંદેશા વિન્ડોની મૂળભુત ઊંચાઈ"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "સંદેશા વિન્ડોની મૂળભુત પહોળાઈ"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "સંદેશા-પ્રદર્શન શૈલી (\"સામાન્ય\", \"આખી હેડરો\", \"સ્રોત\")"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "બહાર નીકળવા પર બગડેલને ખાલી કરરવાના ન્યૂનતમ દિવસો"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "બહાર નીકળવા પર કચરાપેટીને ખાલી કરતી વખતે લાગતા ન્યુનતમ દિવસો"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "બહાર નીકળવા પર બગડેલને ખાલી કરરવાના ન્યૂનતમ દિવસો, દિવસોમાં."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "બહાર નીકળવા પર કચરાપેટીને ખાલી કરતી વખતે લાગતા ન્યુનતમ દિવસો, દિવસોમાં."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "TO/CC/BCC માં દર્શાવવા માટેના સરનામાઓની સંખ્યા"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "ખાલી વિષય પર પ્રોમ્પ્ટ"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "જ્યારે તે અથવા તેણી ફોલ્ડરને સંપૂર્ણ રીતે દૂર કરવા માંગો ત્યારે વપરાશકર્તાને પૂછે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "જ્યારે તે અથવા તેણી વિષય વગર સંદેશો મોકલવાનો પ્રયત્ન કરે છે ત્યારે વપરાશકર્તાને પૂછે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "શું વપરાશકર્રતા તુરંત જ ઓફલાઈન જવા માંગે છે તે ચકાસવા માટે પૂછો"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "જ્યારે શોધ ફોલ્ડરમાંથી સંદેશાઓ કાઢી રહ્યા હોય ત્યારે પૂછો"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "જ્યારે વપરાશકર્તા સંપૂર્ણપણે દૂર કરે છે ત્યારે પૂછે છે"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "જ્યારે વપરાશકર્તા માત્ર આને પણ ખબર વિના મોકલો ભરે છે ત્યારે પૂછે છે"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "જ્યારે વપરાશકર્તા એક જ સમયે ૧૦ અથવા વધુ સંદેશાઓ ખોલવાનો પ્રયત્ન કરે ત્યારે પૂછો"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12706,139 +13411,142 @@ msgstr ""
 "જ્યારે વપરાશકર્તા HTML મેઈલ મેળવનારાઓને મોકલે છે કે જેઓ HTML મેઈલ મેળવવા માંગતા ના હોય "
 "ત્યારે વપરાશકર્તાને પૂછે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "જ્યારે વપરાશકર્તા સંદેશો પ્રતિ અને આને પણ ભર્યા વગર મોકલવાનો પ્રયત્ન કરે છે ત્યારે "
 "વપરાશકર્તાને પૂછે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "જ્યારે વપરાશકર્તા બિનજરુરી HTML મોકલવાનો પ્રયત્ન કરે છે ત્યારે તે વપરાશકર્તાને પૂછે છે"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "વિવિધ સંદેશાઓને ચિહ્નતિ કરતી વખતે પ્રોમ્પ્ટ કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "લખાણમાં ચિહ્નો ઓળખો અને તેમને ચિત્રો સાથે બદલો."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "લખાણમાં કડીઓ ઓળખે છે અને તેઓને બદલે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "આવતા મેઈલ પર બગડેલ ચકાસણી ચલાવો."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "ડિરેક્ટરી સંગ્રહો"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Search for the sender photo in local addressbooks"
 msgstr "સ્થાનિક સરનામાપુસ્તિકાઓમાં મોકલનાર ફોટો માટે શોધો"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "મૂળભુત રીતે HTML મેઈલ મોકલો"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "મૂળભુત રીતે HTML મેઈલ મોકલો."
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "સંદેશા યાદીમાં મોકલનાર ઈમેઈલ-સરનામા સ્તંભ"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "સર્વર સુમેળ અંતરાલ"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "એનિમેશન બતાવો"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "હાલતાં ચાલતાં ચિત્રો એનિમેશન તરીકે બતાવો."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "કાઢી નંખાયેલ સંદેશાઓ સંદેશા યાદીમાં બતાવો (ચેકી નંખાયેલ રીતે)."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "કાઢી નંખાયેલ સંદેશાઓ સંદેશા યાદીમાં બતાવો"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "મોકલનારનો ફોટો બતાવો"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "મોકલનારનું ઈમેઈલ-સરનામું સંદેશા યાદીમાં અલગ સ્તંભમાં બતાવો."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "સંદેશા વાચન તકતીમાં મોકલનારનો ફોટો બતાવો."
 
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "Specifies the header to check for junk."
-msgstr "બગડેલ માટે ચકાસવા માટેની હેડર સ્પષ્ટ કરે છે."
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr "બગડેલ માટે ચકાસવા માટેની હેડર સ્પષ્ટ કરે છે. gconf માં headername=value બંધારણ છે."
-
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "લીટીમાં જોડણી ચકાસો"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Spell checking color"
+msgstr "રંગ જોડણી ચકાસી રહ્યા છીએ"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Spell checking languages"
+msgstr "ભાષામાં જોડણી ચકાસો"
+
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "સંવાદની મૂળભુત ઊંચાઈ નોંધાવો"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "સંવાદની મૂળભુત પહોળાઈ નોંધાવો"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "ટર્મિનલ ફોન્ટ"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "લખાણ સંદેશો ભાગ મર્યાદા"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "બગડેલ હુક માટે મૂળભૂત પ્લગઈન"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "છેલ્લા સમયે બગડેલ ખાલી કરો ચાલ્યું હતું, ઈપોકથી દિવસોમાં."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "છેલ્લે વખતે ખાલી કચરાપેટી ચાલી હતી, દિવસોમાં ઈપોકથી."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "મેઈલ દર્શાવવા માટેના ટર્મિનલ ફોન્ટ."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "મેઈલ દર્શાવવા માટે ચલ પહોળાઈ ફોન્ટ."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:140
+#, fuzzy
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr "આની ત્રણ શક્ય કિંમતો હોઈ શકે. ભૂલો માટે ૦. ચેતવણીઓ માટે ૧. ડિબગ સંદેશાઓ માટે ૨."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -12846,7 +13554,7 @@ msgstr ""
 "આ લખાણ ભાગનું મહત્તમ માપ નક્કી કરે છે કે જે ઈવોલ્યુશન હેઠળ ફોર્મેટ કરી શકાય છે. 4MB / 4096 "
 "KB મૂળભૂત છે અને KB અનુસાર સ્પષ્ટ થાય છે."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -12855,15 +13563,16 @@ msgstr ""
 "આ મૂળભૂગ બગડેલ પ્લગઈન છે, ત્યાં ઘણાબધા પ્લગઈનો સક્રિય કરેલ હોવા છતાંય. જો મૂળભૂત યાદી થયેલ "
 "પ્લગઈન નિષ્ક્રિય કરવામાં આવેલ હોય, તો પછી તે અન્ય ઉપલબ્ધ પ્લગઈનો પર ફોલબેક થશે નહિં."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:143
+#, fuzzy
 msgid ""
-"This key is read only once and reset to false after read. This unselects the "
-"mail in the list and removes the preview for that folder."
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
 msgstr ""
 "આ કી માત્ર એક જ વાર વંચાવી જોઈએ અને વંચાયા પછી ખોટામાં પુનઃસુયોજીત થવી જોઈએ. આ "
 "યાદીમાંથી મેઈલની પસંદગી દૂર કરે છે અને તે ફોલ્ડર માટેનું પૂર્વદર્શન દૂર કરે છે."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12874,11 +13583,18 @@ msgstr ""
 "થશે. XML સંરચનાનું બંધારણ &lt;હેડર સક્રિય&gt; હોય છે - સક્રિય સુયોજિત કરો જો હેડર એ મેઈલ "
 "દેખાવમાં પ્રદર્શિત થાય."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local addressbook only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "આ વિકલ્પ મેળવવાની ઝડપ સુધારવામાં મદદ કરશે."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12886,120 +13602,132 @@ msgstr ""
 "આ મૂળભૂત સંદેશા યાદી દૃશ્યમાં બતાવવા માટેના સરનામાઓની સંખ્યાને સુયોજિત કરે છે, કે જેના પછી "
 "'...' બતાવાયેલ હોય."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
-msgstr "આ સુયોજન સ્પષ્ટ કરે છે કે શું થ્રેડો મૂળભૂત રીતે વિસ્તૃત કે સંકુચિત સ્થિતિમાં હોવા જોઈએ. ઈવોલ્યુશનને પુનઃશરૂ કરવાની જરૂર છે."
+msgstr ""
+"આ સુયોજન સ્પષ્ટ કરે છે કે શું થ્રેડો મૂળભૂત રીતે વિસ્તૃત કે સંકુચિત સ્થિતિમાં હોવા જોઈએ. "
+"ઈવોલ્યુશનને પુનઃશરૂ કરવાની જરૂર છે."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
-msgstr "આ સુયોજન સ્પષ્ટ કરે છે શું થ્રેડો દરેક થ્રેડમાં તાજેતરના સંદેશા પર આધાર રાખીને ક્રમમાં ગોઠવવા જોઈએ, સંદેશાઓની તારીખની જગ્યાએ. ઈવોલ્યુશનને પુનઃશરૂ કરવાની જરૂર છે."
+msgstr ""
+"આ સુયોજન સ્પષ્ટ કરે છે શું થ્રેડો દરેક થ્રેડમાં તાજેતરના સંદેશા પર આધાર રાખીને ક્રમમાં ગોઠવવા "
+"જોઈએ, સંદેશાઓની તારીખની જગ્યાએ. ઈવોલ્યુશનને પુનઃશરૂ કરવાની જરૂર છે."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "સંદેશાની યાદીને થ્રેડ કરો."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "સંદેશા-યાદીને થ્રેડ કરો"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "વિષયને આધારિત સંદેશા-યાદીને થ્રેડ કરો"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "સંદેશાને જોયેલ તરીકે ચિહ્નિત કરવામાં સમયસમાપ્ત"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "સંદેશાને જોયેલ તરીકે ચિહ્નિત કરવામાં સમયસમાપ્ત."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "મૂળભૂત ખાતા માટે UID શબ્દમાળા."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
 msgstr "SpamAssassin ડિમન અને ક્લાઈન્ટ વાપરો"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "SpamAssassin ડિમન અને ક્લાઈન્ટ વાપરો (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "કસ્ટમ ફોન્ટ વાપરો"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "મેઈલ પ્રદર્શિત કરવા માટે વૈવિધ્યપૂર્ણ ફોન્ટ વાપરો."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "માત્ર સ્થાનિક ચકાસણીઓ વાપરો."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "માત્ર સ્થાનિક ચકાસણીઓ વાપરો (DNS નહિં)."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "બાજુ-પછી-બાજુ અથવા પહોળો દેખાવ વાપરો"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "ચલિત પહોળાઈના ફોન્ટ"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "દેખાવ/આને પણ ખબર વિના મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "દેખાવ/આને પણ ખબર વિના મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "દેખાવ/આને પણ મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "દેખાવ/આને પણ મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "દેખાવ/તરફથી મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "દેખાવ/તરફથી મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "દેખાવ/ને મોકલો મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "દેખાવ/ને મોકલો મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "દેખાવ/ને જવાબ આપો મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "દેખાવ/ને જવાબ આપો મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "શું વાંચન રસીદ અરજી દરેક સંદેશામાં મૂળભૂત રીતે ઉમેરાઈ જાય છે."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13007,43 +13735,43 @@ msgstr ""
 "શું થ્રેડિંગને વિષયો દ્વારા પાછા જોવું કે નહિં જ્યારે સંદેશાઓ ના વળતા જવાબમાં અથવા સંદર્ભો "
 "નામની હેડરો સમાવે નહિં ત્યારે."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "શું તાજેતરના સંદેશા પર આધાર રાખીને થ્રેડોને તે થ્રેડમાં ક્રમમાં ગોઠવવા"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "સંદેશા-યાદી તકતીની પહોળાઈ"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "સંદેશા-યાદી તકતીની પહોળાઈ."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Elm માહિતી આયાત કરી રહ્યા છીએ"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "ઈવોલ્યુશન Elm આયાત કરનાર"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Elm માંથી મેઈલ આયાત કરો."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "અંતિમ મુકામનું ફોલ્ડર:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "માં આયાત કરવા માટેનું ફોલ્ડર પસંદ કરો"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "બર્કલી મેઈલબોક્સ (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "બર્કલી મેઈલબોક્સ બંધારણના ફોલ્ડરો આયાત કરનાર"
 
@@ -13051,7 +13779,7 @@ msgstr "બર્કલી મેઈલબોક્સ બંધારણના
 msgid "Importing mailbox"
 msgstr "મેઈલબોક્સ આયાત કરી રહ્યા છીએ"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' આયાત કરી રહ્યા છીએ"
@@ -13061,15 +13789,15 @@ msgstr "`%s' આયાત કરી રહ્યા છીએ"
 msgid "Scanning %s"
 msgstr "%s સ્કેન કરી રહ્યા છીએ"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "ખોવાયેલ માહિતી આયાત કરી રહ્યું છે"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "ઈવોલ્યુશન પાઈન આયાત કરનાર"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Pine માંથી મેઈલ આયાત કરો."
 
@@ -13097,139 +13825,154 @@ msgstr "%s મેઈલીંગ યાદી"
 msgid "Add Filter Rule"
 msgstr "ગાળક નિયમ ઉમેરો"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "ટેમ્પલેટો"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d પસંદ થયેલ, "
 msgstr[1] "%d પસંદ થયેલ, "
 
-#: ../mail/mail-component.c:540
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d કાઢી નંખાયેલ છે"
 msgstr[1] "%d કાઢી નંખાયેલ છે"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d બગડેલ છે"
 msgstr[1] "%d બગડેલા છે"
 
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ડ્રાફ્ટ"
 msgstr[1] "%d ડ્રાફ્ટો"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d મોકલાયેલ છે"
 msgstr[1] "%d મોકલાયેલા છે"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d અસુયોજિત છે"
 msgstr[1] "%d અસુયોજિત છે"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d નહિં વંચાયેલ, "
 msgstr[1] "%d નહિં વંચાયેલ, "
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d કુલ"
 msgstr[1] "%d કુલ"
 
-#: ../mail/mail-component.c:896
+#: ../mail/mail-component.c:916
 msgid "New Mail Message"
 msgstr "નવો મેઈલ સંદેશો"
 
-#: ../mail/mail-component.c:897
+#: ../mail/mail-component.c:917
+msgctxt "New"
 msgid "_Mail Message"
 msgstr "મેઈલ સંદેશો (_M)"
 
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:918
 msgid "Compose a new mail message"
 msgstr "નવો મેઈલ સંદેશો કમ્પોઝ કરો"
 
-#: ../mail/mail-component.c:904
+#: ../mail/mail-component.c:924
 msgid "New Mail Folder"
 msgstr "નવું મેઈલ ફોલ્ડર"
 
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:925
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "મેઈલ ફોલ્ડર (_F)"
 
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:926
 msgid "Create a new mail folder"
 msgstr "નવું મેઈલ ફોલ્ડર બનાવો"
 
-#: ../mail/mail-component.c:1053
+#: ../mail/mail-component.c:1073
 msgid "Failed upgrading Mail settings or folders."
 msgstr "મેઈલ સુયોજનો અથવા ફોલ્ડરો સુધારવામાં નિષ્ફળ."
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1586
 msgid "Error"
 msgstr "ભૂલ"
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1586
 msgid "Errors"
 msgstr "ભૂલો"
 
-#: ../mail/mail-component.c:1523
+#: ../mail/mail-component.c:1587
 msgid "Warnings and Errors"
 msgstr "ચેતવણીઓ અને ભૂલો"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1588
 msgid "Debug"
 msgstr "ડિબગ"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1588
 msgid "Error, Warnings and Debug messages"
 msgstr "ભૂલ, ચેતવણીઓ અને ડિબગ સંદેશાઓ"
 
-#: ../mail/mail-component.c:1634
+#: ../mail/mail-component.c:1715
 msgid "Debug Logs"
 msgstr "ડિબગ લોગ"
 
-#: ../mail/mail-component.c:1638
+#: ../mail/mail-component.c:1729
 msgid "Show _errors in the status bar for"
 msgstr "આના માટે પરિસ્થિતિદર્શક પટ્ટીમાં ભૂલો બતાવો (_e)"
 
-#: ../mail/mail-component.c:1645
-msgid "seconds."
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1745
+msgid "second(s)."
 msgstr "સેકન્ડો."
 
-#: ../mail/mail-component.c:1655
+#: ../mail/mail-component.c:1751
 msgid "Log Messages:"
 msgstr "લોગ સંદેશાઓ:"
 
-#: ../mail/mail-component.c:1707
+#: ../mail/mail-component.c:1792
 msgid "Log Level"
 msgstr "લોગ સ્તર"
 
-#: ../mail/mail-component.c:1714 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "સમય"
 
-#: ../mail/mail-component.c:1721 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1811 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "સંદેશાઓ"
 
+#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "આ વિન્ડો બંધ કરો"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " આધારભૂત સેવાઓ માટે ચકાસો (_e) "
@@ -13243,7 +13986,7 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL એ ઈવોલ્યુશનની આ આવૃત્તિમાં આધારભૂત નથી</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>મોકલનાર ફોટોગ્રાફ</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13324,73 +14067,73 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">છપાયેલ ફોન્ટ</span>"
 
 #: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">પ્રોક્સી સુયોજનાઓ</span>"
+
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">જરુરી જાણકારી</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">સુરક્ષિત MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">સુરક્ષા</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">મોકલાયેલ અને ડ્રાફ્ટ સંદેશાઓ</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">સર્વર રુપરેખાંકન</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">સત્તાધિકરણ પ્રકાર (_A)</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "ખાતા વ્યવસ્થા"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "નવી સહી ઉમેરો (_w)..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "લિપી ઉમેરો (_S)"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "જ્યારે આ ખાતુ વાપરી રહ્યા હોય ત્યારે હંમેશા જતા સંદેશાઓને સહી કરો (_w)"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "જ્યારે એનક્રિપ્ટ થયેલ સંદેશાઓ મોકલી રહ્યા હોય ત્યારે તેને પણ એનક્રિપ્ટ કરો (_f)"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "હંમેશા કાર્બન કોપી (આને પણ) (_s):"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "હંમેશા અંધ કાર્બન કોપી મોકલો (bcc) (_b):"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "જ્યારે એનક્રિપ્ટ કરી રહ્યા હોય ત્યારે હંમેશા મારી કીરીંગમાં કી પર વિશ્વાસ કરો (_t)"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "જ્યારે એનક્રિપ્ટ થયેલ સંદેશાઓ મોકલી રહ્યા હોય ત્યારે હંમેશા પોતાને એનક્રિપ્ટ કરો (_m)"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr "વાંચન રસીદની હંમેશા અરજી કરો (_d)"
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "મૂળ સંદેશો જોડો"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
 msgstr "ચિહ્ન ચિત્રો આપોઆપ દાખલ કરો (_e)"
@@ -13408,13 +14151,14 @@ msgid "C_haracter set:"
 msgstr "અક્ષરોનો સમૂહ (_h):"
 
 #: ../mail/mail-config.glade.h:50
-msgid "C_heck custom headers for junk"
-msgstr "બગાડ માટે વૈવિધ્યપૂર્ણ હેડરો ચકાસો (_h)"
-
-#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "આધારભૂત પ્રકારો માટે ચકાસો (_e)"
 
+#: ../mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Check cu_stom headers for junk"
+msgstr "બગાડ માટે વૈવિધ્યપૂર્ણ હેડરો ચકાસો (_h)"
+
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
 msgstr "બગાડ માટે આવતા સંદેશાઓ ચકાસો (_m)"
@@ -13476,16 +14220,17 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "બહાર જતા સંદેશાઓને ડિજીટલ રીતે સહી કરો (મૂળભૂત રીતે) (_u)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
-msgstr "સંદેશાઓને બગડેલ તરીકે ચિહ્નિત કરો નહિં જો મોકલનાર મારી સરનામાપુસ્તિકામાં હોય (_n)"
+#, fuzzy
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "સંદેશાઓમાંનના લખાણ સમાવિષ્ટો ફોર્મેટ કરશો નહિં જો લખાણ માપ આના કરતાં વધી જાય (_z)"
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr "સંદેશાઓમાંનના લખાણ સમાવિષ્ટો ફોર્મેટ કરશો નહિં જો લખાણ માપ આના કરતાં વધી જાય (_z)"
+msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgstr "સંદેશાઓને બગડેલ તરીકે ચિહ્નિત કરો નહિં જો મોકલનાર મારી સરનામાપુસ્તિકામાં હોય (_k)"
 
 #: ../mail/mail-config.glade.h:73
-msgid "Do not quote original message"
-msgstr "મૂળ સંદેશાને અવતરિત કરો નહિં"
+msgid "Do not quote"
+msgstr "ક્વોટા કરો નહિં"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -13548,68 +14293,85 @@ msgid "HTML Messages"
 msgstr "HTML સંદેશાઓ"
 
 #: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr "HTTP પ્રોક્સી (_T):"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "હેડરો"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "અવતરણોને આની સાથે પ્રકાશિત કરો (_q)"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "લીટીની અંદર"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
-msgstr "લીટીમાં મૂળ સંદેશો (આઉટલુક શૈલી)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr "ઇનલાઇન (આઉટલુક શૈલી)"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "લેબલો"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "ભાષાઓનું કોષ્ટક"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "મેઈલ રુપરેખાંકન"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "મેઈલ હેડરોનું કોષ્ટક"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "મેઈલબોક્સ જગ્યા"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "સંદેશા કમ્પોઝર"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:107
 msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr "નોંધ: લેબલ નામમાં નીચે લીટી એ મેનુમાં સાંકેતિક ચિહ્ન ઓળખનાર તરીકે વપરાય છે."
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "નોંધ: જ્યાં સુધી તમે પહેલી વખત જોડાવો નહિં ત્યાં સુધી તે તમને પાસવર્ડ માટે પૂછશે નહિં"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:109
+#, fuzzy
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "આ વિકલ્પ પર ફરીથી લખવામાં આવશે જો વૈવિધ્યપૂર્ણ બગડેલ હેડરો માટે જોડણી મળી આવે."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "સંસ્થા (_g):"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:112
+msgid "Pass_word:"
+msgstr "પાસવર્ડ (_w):"
+
+#: ../mail/mail-config.glade.h:114
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13617,7 +14379,7 @@ msgstr ""
 "મહેરબાની કરીને આ ખાતા માટે નીચેની જગ્યામાં વર્ણનાત્મક નામ દાખલ કરો.\n"
 "આ નામ માત્ર પ્રદર્શનના હેતુ માટે જ વપરાશે."
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13625,7 +14387,7 @@ msgstr ""
 "મહેરબાની કરીને તમે કઈ રીતે મેઈલ મોકલો તે વિશે જાણકારી દાખલ કરો. જો તમે ચોક્કસ નહિં "
 "હોય, તો તમારા સિસ્ટમ સંચાલક અથવા ઈન્ટરનેટ સેવા પૂરી પાડનારને પૂછો."
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:117
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13634,107 +14396,115 @@ msgstr ""
 "મહેરબાની કરીને નીચે તમારું નામ અને ઈ-મેઈલ સરનામું દાખલ કરો. નીચેના \"વૈકલ્પિક\" ક્ષેત્રો "
 "ભરવાની જરુર નથી, જ્યાં સુધી તમે આ જાણકારી તમે મોકલેલા ઈ-મેઈલમાં સમાવવા માંગો નહિં."
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "મહેરબાની કરીને નીચેના વિકલ્પોમાંથી પસંદ કરો"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+msgid "Port:"
+msgstr "પોર્ટ:"
+
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "જ્યારે સંદેશાઓ આને પણ ખબર વિના દ્વારા મોકલો ત્યારે પૂછો"
 
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr "મૂળ સંદેશાને અવતરિત કરો"
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "અવતરિત"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "પાસવર્ડ યાદ રાખો (_m)"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "ને જવાબ આપો (_p):"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "પાસવર્ડ યાદ રાખો (_p)"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
+msgstr "SOCKS યજમાન (_O)"
+
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "સ્થાનિક સરનામાપુસ્તિકાઓમાં માત્ર મોકલનાર ફોટોગ્રાફ માટે જ શોધો (_e)"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "પસંદ કરો (_e)..."
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "સંદેશા રસીદો મોકલો (_e):"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "પ્રમાણભૂત ફોન્ટ (_t):"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "HTML ચોક્કસ પહોળાઈ ફોન્ટ પસંદ કરો"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "છાપવા માટે HTML ચોક્કસ પહોળાઈ ફોન્ટ પસંદ કરો"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "HTML ચલિત પહોળાઈ ફોન્ટ પસંદ કરો"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "છાપન માટે HTML ચલિત પહોળાઈ ફોન્ટ પસંદ કરો"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "મેઈલ મોકલી રહ્યા છીએ"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "મોકલાયેલ સંદેશાઓનું ફોલ્ડર (_M):"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "સર્વરને સત્તાધિકરણ જરુરી છે (_v)"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "સર્વરનો પ્રકાર (_T): "
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "સહી કરવાનું પ્રમાણપત્ર (_n):"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "સહી (_u):"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "સહીઓ"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "સહીઓનું કોષ્ટક"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "જોડણી ચકાસી રહ્યા છીએ"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "પ્રકાર (_y): "
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -13742,7 +14512,7 @@ msgstr ""
 "અંહિય યાદી થયેલ ભાષાઓમાંની માત્ર તે જ ભાષાઓ પરાવર્તિત થાય છે જેમના માટે તમે શબ્દકોષ "
 "સ્થાપિત કર્યો છે."
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13752,11 +14522,7 @@ msgstr ""
 "તમે સ્પષ્ટ કરેલ નામ માત્ર ડિસ્પ્લેના હેતુ માટે\n"
 "વપરાશે. "
 
-#: ../mail/mail-config.glade.h:146
-msgid "This option will be overridden if a match for custom junk headers is found."
-msgstr "આ વિકલ્પ પર ફરીથી લખવામાં આવશે જો વૈવિધ્યપૂર્ણ બગડેલ હેડરો માટે જોડણી મળી આવે."
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13764,16 +14530,25 @@ msgstr ""
 "નામ છાપો કે જેના દ્વારા તમે આ ખાતાને વાપરવા માંગો છો.\n"
 "ઉદાહરણ તરીકે: \"કામ\" અથવા \"ખાનગી\""
 
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:154
+msgid "Us_ername:"
+msgstr "વપરાશકર્તા નામ (__e):"
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "સત્તાધિકરણ વાપરો (_n)"
+
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:364
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "વપરાશકર્તા નામ (_n):"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "ચલિત-પહોળાઈ (_a):"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13783,100 +14558,126 @@ msgstr ""
 "\n"
 "શરુઆત કરવા માટે \"આગળ ધપાવો\" પર ક્લિક કરો. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "સહી ઉમેરો (_A)"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "હંમેશા ઈન્ટરનેટમાંથી ચિત્રો લાવો (_A)"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr "આપોઆપ પ્રોક્સી રૂપરેખાંકન URL (_A):"
+
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "મૂળભૂત બગડેલ પ્લગઈન (_D):"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "ઇન્ટરનેટ માટે સીધુ જ જોડાણ (_D)"
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "મંત્રણાની માંગણીઓની સહી કરો નહિં (આઉટલુકની સાથે સુસંગતતા માટે) (_D)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "આગળ ધપાવવાની શૈલી (_F):"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "પ્રત્યુત્તર આપવા પર મૂળ સંદેશા ઉપર સહી રાખો (_K)"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "સંપર્કોમાંથી સંદેશાઓમાં ચિત્રો લાવો (_L)"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Lookup in local addressbook only"
+msgstr "સ્થાનિક સરનામાપોથી ફોલ્ડરોની યાદી આપો"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "આને મારુ મૂળભુત ખાતું બનાવો (_M)"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr "મેન્યુઅલ પ્રોક્સી રૂપરેખાંકન (_M):"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "પછી વંચાયેલ સંદેશાઓને ચિહ્નિત કરો (_M)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "ઈન્ટરનેટમાંથી ક્યારેય ચિત્રો લાવો નહિં (_N)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "પથ (_P):"
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#: ../mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "સંપર્કો કે જેઓને જરુર ના હોય તોપણ HTML સંદેશાઓ મોકલી રહ્યા હોય ત્યારે તેમને પૂછો (_P)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "જ્યારે સંદેશો ખાલી વાક્ય સાથે મોકલી રહ્યા હોય ત્યારે પૂછો (_P)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "જવાબની શૈલી (_R):"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "લિપી (_S):"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr "સુરક્ષિત HTTP પ્રોક્સી (_S):"
+
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "પસંદ કરો (_S)..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "ચિત્ર એનીમેશનો બતાવો (_S)"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "સંદેશા પૂર્વદર્શનમાં મોકલનારનો ફોટોગ્રાફ બતાવો (_S)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "પ્રતિ / આને પણ / આને પણ ખબર વિના હેડરો આમાં સંકોચો (_S) "
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "સુરક્ષિત જોડાણ વાપરો (_U):"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "મૂળભુત સિસ્ટમ વાપરો (_U)"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "બીજા કાર્યક્રમોનની જેમ સરખા ફોન્ટ વાપરો (_U)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "સરનામાઓ"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "રંગ"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "વર્ણન"
 
@@ -13916,43 +14717,43 @@ msgstr "કેસ પ્રત્યે સંવેદનશીલ (_s)"
 msgid "Co_mpleted"
 msgstr "સમાપ્ત (_m)"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "શોધો (_n):"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "સંદેશામાં શોધો"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
 msgid "Flag to Follow Up"
 msgstr "અનુસરવા માટેની નિશાની"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "ફોલ્ડરની ઉમેદવારી"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "લાઈસન્સ મંજૂરીપત્ર"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "કંઈ પસંદ થયેલ નથી"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "સર્વર (_e):"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "સુરક્ષા જાણકારી"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "ચોક્કસ ફોલ્ડરો"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13960,23 +14761,23 @@ msgstr ""
 "તમે અનુસરવા માટે પસંદ કરેલ દરેક સંદેશાઓ નીચે યાદીત કરેલ છે.\n"
 "મહેરબાની કરીને નીચેની ક્રિયા માટે \"નિશાની\" મેનુ પસંદ કરો."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "લાઈસન્સ સ્વીકારો (_A)"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "દ્વારા છેલ્લે (_D):"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "ઝંડો (_F):"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "લાઈસન્સની મંજૂરી સ્વીકારવા માટે આને ચિહ્નિત કરો (_T)"
 
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "%s ને ચકાસી રહ્યા છીએ"
@@ -14023,11 +14824,11 @@ msgstr "%d માંના %d સંદેશાને મોકલી રહ્
 msgid "Failed to send %d of %d messages"
 msgstr "%d માંના %d સંદેશાઓને મોકલવામાં નિષ્ફળ"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "રદ થઈ ગયેલ."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "પૂર્ણ."
 
@@ -14055,67 +14856,72 @@ msgid "Opening folder %s"
 msgstr "ફોલ્ડર %s ખોલી રહ્યા છીએ"
 
 #: ../mail/mail-ops.c:1270
+#, fuzzy, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "%s માટે સંપર્ક જાણકારી"
+
+#: ../mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "સ્ટોર %s ખોલી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1410
 #, c-format
 msgid "Removing folder %s"
 msgstr "ફોલ્ડર %s દૂર કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1499
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ફોલ્ડર '%s' સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1562
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ખાતું '%s' સંપૂર્ણપણે દૂર કરી રહ્યા છીએ અને સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1563
 #, c-format
 msgid "Storing account '%s'"
 msgstr "ખાતુ '%s' સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1617
 msgid "Refreshing folder"
 msgstr "ફોલ્ડર ફરીથી તાજું કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
 msgid "Expunging folder"
 msgstr "ફોલ્ડર સંપૂર્ણપણે દૂર કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1704
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "કચરાપેટીને '%s' માં ખાલી કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1705
 msgid "Local Folders"
 msgstr "સ્થાનિક ફોલ્ડરો"
 
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1786
 #, c-format
 msgid "Retrieving message %s"
 msgstr "સંદેશો %s મેળવી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1893
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d સંદેશો મેળવી રહ્યા છીએ"
 msgstr[1] "%d સંદેશાઓ મેળવી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1906
+#: ../mail/mail-ops.c:1978
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "%d સંદેશાનો સંગ્રહ કરી રહ્યા છીએ"
 msgstr[1] "%d સંદેશાઓ સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14124,11 +14930,11 @@ msgstr ""
 "માં સંદેશાઓ સંગ્રહતી વખતે ભૂલ: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2128
 msgid "Saving attachment"
 msgstr "જોડાણ સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14137,51 +14943,51 @@ msgstr ""
 "આઉટપુટ ફાઈલ બનાવી શકતા નથી: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2169
 #, c-format
 msgid "Could not write data: %s"
 msgstr "માહિતી લખી શક્યા નહિં: %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%sમાંથી સંપર્ક તોડી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s સાથે ફરીથી જોડાઈ રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2411
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "ઓફલાઈન માટે ખાતું '%s' તૈયાર કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2497
 msgid "Checking Service"
 msgstr "સેવા ચકાસી રહ્યા છીએ"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:182
 msgid "Canceling..."
 msgstr "રદ કરી રહ્યા છીએ..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:385
 msgid "Send & Receive Mail"
 msgstr "મેઈલ મોકલો અને મેળવો"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:396
 msgid "Cancel _All"
 msgstr "બધું નકારો (_A)"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:505
 msgid "Updating..."
 msgstr "સુધારી રહ્યા છીએ..."
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "રાહ જોઈ રહ્યા છીએ..."
 
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "નવા મેઈલ માટે ચકાસી રહ્યા છીએ"
@@ -14209,17 +15015,17 @@ msgstr "પાસવર્ડ દાખલ કરો"
 msgid "User canceled operation."
 msgstr "વપરાશકર્તાએ પ્રક્રિયા નકારી કાઢી."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "સહીમાં ફેરફાર કરો"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "સંગ્રહો અને બંધ કરો (_S)"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "આ સહી માટે નામ દાખલ કરો."
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "સહીમાં ફેરફાર કરો"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "નામ:"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "સહીનું નામ (_S):"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14260,45 +15066,45 @@ msgstr "'%s:%s' માટે શોધ ફોલ્ડરો સુધારી
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s' માટે શોધ ફોલ્ડરો સુધારી રહ્યા છીએ"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "શોધ ફોલ્ડરમાં ફેરફાર"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "નવું શોધ ફોલ્ડર"
 
 #: ../mail/mail.error.xml.h:1
-msgid "A folder named &quot;{0}&quot; already exists. Please use a different name."
-msgstr "&quot;{0}&quot; નામવાળું ફોલ્ડર પહેલાથી જ હાજર છે. મહેરબાની કરીને અલગ નામ વાપરો."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "\"{0}\" નામવાળું ફોલ્ડર પહેલાથી જ હાજર છે. મહેરબાની કરીને અલગ નામ વાપરો."
 
 #: ../mail/mail.error.xml.h:2
-msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr "&quot;{1}&quot; નામવાળું ફોલ્ડર પહેલાથી જ હાજર છે. મહેરબાની કરીને અલગ નામ વાપરો."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "\"{1}\" નામવાળું ફોલ્ડર પહેલાથી જ હાજર છે. મહેરબાની કરીને અલગ નામ વાપરો."
 
 #: ../mail/mail.error.xml.h:3
 msgid ""
-"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"A non-empty folder at \"{1}\" already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 msgstr ""
-"&quot;{1}&quot; જગ્યાએ ખાલી નહિં હોય એવું ફોલ્ડર હાજર છે.\n"
+"\"{1}\" જગ્યાએ ખાલી નહિં હોય એવું ફોલ્ડર હાજર છે.\n"
 "\n"
 "તમે આ ફોલ્ડરને અવગણવા માટે પસંદ કરી શકો છો, તેના સમાવષ્ટો પર ફરીથી લખી શકો છો અથવા "
 "તેમાં ઉમેરી શકો છો, અથવા બહાર નીકળી શકો છો."
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
-msgstr "વાંચન રસીદ સૂચને &quot;{1}&quot; માટે અરજી કરી છે.  શું {0} ને રસીદ સૂચન મોકલવું છે?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
+msgstr "વાંચન રસીદ સૂચને \"{1}\" માટે અરજી કરી છે.  શું {0} ને રસીદ સૂચન મોકલવું છે?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
-msgstr "&quot;{0}&quot; નામવાળી સહી પહેલાથી જ હાજર છે. મહેરબાની કરીને અલગ નામ સ્પષ્ટ કરો."
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr "\"{0}\" નામવાળી સહી પહેલાથી જ હાજર છે. મહેરબાની કરીને અલગ નામ સ્પષ્ટ કરો."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -14333,10 +15139,8 @@ msgstr "શું તમે બધા કાઢી નંખાયેલા સ�
 #: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
-msgstr ""
-"શું તમે ચોક્કસ છો તમે કાયમ માટે તમારા &quot;{0}&quot; ફોલ્ડરમાંના સંદેશાને દૂર કરવા માંગો "
-"છો?"
+"folder \"{0}\"?"
+msgstr "શું તમે બધા કાઢી નંખાયેલા સંદેશાઓને બધા ફોલ્ડર \"{0}\" માંથી કાયમી રીતે દૂર કરવા માંગો છો?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14351,99 +15155,102 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "શું તમે ચોક્કસ છો કે તમે સંદેશાને વિષય વિના મોકલવા માંગો છો?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; ના કારણે."
+msgid "Because \"{0}\"."
+msgstr "\"{0}\" ના કારણે."
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
-msgstr "&quot;{2}&quot; ના કારણે."
+msgid "Because \"{2}\"."
+msgstr " \"{2}\" ના કારણે."
 
 #: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "કોરી સહી"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "શોધ ફોલ્ડર &quot;{0}&quot; ઉમેરી શકતા નથી."
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "શોધ ફોલ્ડર \"{0}\" ઉમેરી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "ફોલ્ડર &quot;{0}&quot; ને &quot;{1}&quot; માં નકલ કરી શકતા નથી."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "ફોલ્ડર \"{0}\" ને \"{1}\" માં નકલ કરી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "ફોલ્ડર &quot;{0}&quot; બનાવી શકતા નથી."
+msgid "Cannot create folder \"{0}\"."
+msgstr "ફોલ્ડર \"{0}\" બનાવી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "કામચલાઉ સંગ્રહ ડિરેક્ટરી બનાવી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "સંગ્રહ ડિરેક્ટરી બનાવી શકતા નથી, &quot;{1}&quot; ના કારણે"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "સંગ્રહ ડિરેક્ટરી બનાવી શકતા નથી, \"{1}\" ના કારણે"
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "ફોલ્ડર &quot;{0}&quot; કાઢી શકતા નથી."
+msgid "Cannot delete folder \"{0}\"."
+msgstr "ફોલ્ડર \"{0}\" કાઢી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "સિસ્ટમ ફોલ્ડર &quot;{0}&quot; કાઢી શકતા નથી."
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "સિસ્ટમ ફોલ્ડર \"{0}\" કાઢી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "શોધ ફોલ્ડર &quot;{0}&quot; માં ફેરફાર કરી શકતા નથી કારણ કે તે અસ્તિત્વમાં નથી."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "શોધ ફોલ્ડર \"{0}\" માં ફેરફાર કરી શકતા નથી કારણ કે તે અસ્તિત્વમાં નથી."
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "ફોલ્ડર &quot;{0}&quot; ને &quot;{1}&quot; માં ખસેડી શકતા નથી."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "ફોલ્ડર \"{0}\" ને \"{1}\" માં ખસેડી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr "&quot;{1}&quot; ને ઓપન સોર્સ કરી શકતા નથી"
+msgid "Cannot open source \"{1}\""
+msgstr "\"{1}\" ને ઓપન સોર્સ કરી શકતા નથી"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr "&quot;{2}&quot; ને ઓપન સોર્સ કરી શકતા નથી."
+msgid "Cannot open source \"{2}\"."
+msgstr "\"{2}\" ને ઓપન સોર્સ કરી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
-msgstr "લક્ષ્ય &quot;{2}&quot; ખોલી શકતા નથી."
+msgid "Cannot open target \"{2}\"."
+msgstr "લક્ષ્ય \"{2}\" ખોલી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:34
 msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"license."
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
 msgstr ""
-"લાઈસન્સ ફાઈલ &quot;{0}&quot; વાંચી શકતા નથી, સ્થાપન સમસ્યાને કારણે.  જ્યાં સુધી તમે આ "
+"લાઈસન્સ ફાઈલ \"{0}\" વાંચી શકતા નથી, સ્થાપન સમસ્યાને કારણે.  જ્યાં સુધી તમે આ "
 "વિક્રેતાનું લાઈસન્સ સ્વીકારો નહિં ત્યાં સુધી તમે એને વાપરવા સમર્થ નથી."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "&quot;{0}&quot; નું નામ &quot;{1}&quot; બદલી શકતા નથી."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "\"{0}\" નું નામ \"{1}\" બદલી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr "સિસ્ટમ ફોલ્ડર &quot;{0}&quot; નું નામ બદલી શકાતું નથી અથવા કાઢી શકાતું નથી."
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "સિસ્ટમ ફોલ્ડર \"{0}\" નું નામ બદલી શકાતું નથી અથવા કાઢી શકાતું નથી."
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "ખાતામાં બદલાવો સંગ્રહી શકાતા નથી."
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "ડિરેક્ટરી &quot;{0}&quot; માં સંગ્રહી શકાતું નથી."
+msgid "Cannot save to directory \"{0}\"."
+msgstr "ડિરેક્ટરી \"{0}\" માં સંગ્રહી શકાતું નથી."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "ફાઈલ &quot;{0}&quot; માં સંગ્રહી શકાતું નથી."
+msgid "Cannot save to file \"{0}\"."
+msgstr "ફાઈલ \"{0}\" માં સંગ્રહી શકાતું નથી."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "સહી સ્ક્રિપ્ટ &quot;{0}&quot; સુયોજિત કરી શકતા નથી."
+msgid "Cannot set signature script \"{0}\"."
+msgstr "સહી સ્ક્રિપ્ટ \"{0}\" સુયોજિત કરી શકતા નથી."
 
 #: ../mail/mail.error.xml.h:41
+msgid "Check Junk Failed"
+msgstr "જંક નિષ્ફળતા માટે ચકાસો"
+
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14451,46 +15258,42 @@ msgstr ""
 "તમારો પાસવર્ડ યોગ્ય રીતે લખાયેલો છે કે તે ચકાસવા માટે ખાતરી કરો. યાદ રાખો કે ઘણા "
 "પાસવર્ડો કેસ પ્રત્યે સંવેદનશીલ હોય છે; તમારી કેપ્સ લોક કી કદાચ ચાલુ હશે."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "સહીની ફાઈલ સંગ્રહી શક્યા નહિં."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "શું &quot;{0}&quot; કાઢી નાંખવું છે?"
-
 #: ../mail/mail.error.xml.h:44
-msgid "Delete account?"
-msgstr "ખાતું કાઢી નાંખવું છે?"
+msgid "Delete \"{0}\"?"
+msgstr "શું \"{0}\" કાઢી નંખાયેલ છે?"
 
 #: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr "શું શોધ ફોલ્ડર &quot;{0}&quot; માં સંદેશાઓ કાઢી નાંખવા છે?"
+msgid "Delete account?"
+msgstr "ખાતું કાઢી નાંખવું છે?"
 
 #: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "શું શોધ ફોલ્ડર \"{0}\" માંના સંદેશાઓ કાઢી નાંખવા છે?"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
 msgstr "શું શોધ ફોલ્ડરમાંના સંદેશાઓ કાઢી નાંખવા છે?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "શું ફેરફારો અવગણવા માંગો છો?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "કાઢશો નહિં (_e)"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "કાઢો નંહિ"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "નિષ્ક્રિય કરશો નંહિ"
 
-#: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "શું તમે ઉપફોલ્ડરોમાં પણ પ્રક્રિયા કરવા માંગો છો?"
-
 #: ../mail/mail.error.xml.h:52
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
@@ -14591,34 +15394,26 @@ msgid "Mark all messages as read"
 msgstr "બધા સંદેશાઓને વંચાયેલ એમ ચિહ્નિત કરો"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "શું આ ફોલ્ડર અને ઉપફોલ્ડરોમાંના બંધા સંદેશાઓને વંચાયેલ ચિહ્નિત કરવા માંગો છો?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "ખોવાયેલ ફોલ્ડર."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "કોઈ સ્રોતો પસંદ થયેલ નથી."
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "માત્ર વર્તમાન ફોલ્ડર પર (_C)"
-
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "એક જ સમયે ઘણા સંદેશાઓ ખોલવાનું ખૂબ લાંબો સમય લે છે."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "મહેરબાની કરીને તમારા ખાતા સુયોજનો ચકાસો અને ફરીથી પ્રયત્ન કરો."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "મહેરબાની કરીને ખાતું સક્રિય કરો અથવા અન્ય ખાતા મારફતે મોકલો."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14626,7 +15421,7 @@ msgstr ""
 "મહેરબાની કરીને માન્ય ઈ-મેઈલ સરનામું પ્રતિ ક્ષેત્રમાં દાખલ કરો. તમે પ્રતિ પર ક્લિક કરીને ઈ-"
 "મેઈલ સરનામું શોધી શકો છો કે જે પ્રવેશ બોક્સ પછી તરતનું બટન છે."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14635,33 +15430,41 @@ msgstr ""
 "મહેરબાની કરીને ખાતરી કરો કે નીચેના મેળવનારાઓ HTML ઈ-મેઈલ મેળવવા માંગે છે અને સમર્થ છે ને:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "આ સહી ઓળખવા માટે મહેરબાની કરીને અનન્ય નામ પૂરું પાડો."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "મહેરબાની કરીને રાહ જુઓ."
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "જૂના મેઈલ ફોલ્ડર &quot;{0}&quot; ને ખસેડવામાં સમસ્યા છે."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "જૂના મેઈલ ફોલ્ડર \"{0}\" ને ખેસેડવામાં સમસ્યા છે."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "સર્વરને પૂછી રહ્યા છીએ"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "આધારભૂત સત્તાધિકરણ પદ્ધતિઓની યાદી માટે સર્વરને પૂછી રહ્યા છીએ."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "વાંચન રસીદની અરજી થઈ."
 
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "શું ખરેખર ફોલ્ડર \"{0}\" અને તેની બધી ઉપડિરેક્ટરીઓ કાઢી નાંખવી છે?"
+
+#: ../mail/mail.error.xml.h:90
+msgid "Report Junk Failed"
+msgstr "જંક નિષ્ફળતાનો રિપોર્ટ કરો"
+
 #: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "શું ખરેખર ફોલ્ડર &quot;{0}&quot; અને તેની બધી ઉપડિરેક્ટરીઓ કાઢી નાંખવી છે?"
+msgid "Report Not Junk Failed"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
@@ -14711,13 +15514,13 @@ msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
-"નીચેના શોધ ફોલ્ડર(ો):\n"
+"નીચેના શોધ ફોલ્ડરો:\n"
 "{0}\n"
 "હવે દૂર કરાયેલ ફોલ્ડરો વપરાય છે:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "અને હવે સુધારાઈ ગયેલ છે."
 
 #: ../mail/mail.error.xml.h:106
@@ -14725,13 +15528,13 @@ msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "નીચેના ગાળકના નિયમો:\n"
 "{0}\n"
 "હમણાં દૂર થયેલ ફોલ્ડર વપરાયેલ છે:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "અને હવે સુધારાઈ ગયેલ છે."
 
 #: ../mail/mail.error.xml.h:111
@@ -14804,7 +15607,8 @@ msgid ""
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
-"ચેતવણી: શોધ ફોલ્ડરમાંથી સંદેશાઓ કાઢી નાંખવાનું તમારા સ્થાનિક અથવા દૂરસ્થ ફોલ્ડરોમાંના એકમાંથી વાસ્તવિક સંદેશાને કાઢી નાંખશે.\n"
+"ચેતવણી: શોધ ફોલ્ડરમાંથી સંદેશાઓ કાઢી નાંખવાનું તમારા સ્થાનિક અથવા દૂરસ્થ ફોલ્ડરોમાંના "
+"એકમાંથી વાસ્તવિક સંદેશાને કાઢી નાંખશે.\n"
 "શું તમે ખરેખર આવું કરવા માંગો છો?"
 
 #: ../mail/mail.error.xml.h:127
@@ -14838,8 +15642,8 @@ msgstr ""
 "ફોલ્ડરો, અથવા બંને પસંદ કરીને."
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr "તમારા સર્વર પરનો તમારો પ્રવેશ &quot;{0}&quot; નો &quot;{0}&quot; તરીકે નિષ્ફળ."
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "તમારા સર્વર પરનો તમારો પ્રવેશ \"{0}\" નો \"{0}\" તરીકે નિષ્ફળ."
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -14861,77 +15665,88 @@ msgstr "સંપૂર્ણપણે કાઢી નાંખો (_E)"
 msgid "_Open Messages"
 msgstr "સંદેશાઓ ખોલો (_O)"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "વર્તમાન ફોલ્ડર અને ઉપફોલ્ડર પર (_S)"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "જોયેલ નથી"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "જોયેલ છે"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "જવાબ અપાયેલ છે"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1054
+msgid "Forwarded"
+msgstr "આગળ ધપાવેલ છે"
+
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "ઘણા બધા નહિં જોયેલા સંદેશાઓ"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "ઘણા બધા સંદેશાઓ"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "નીચામાં નીચું"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "થી નીચું"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "થી ઊંચું"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "ઊંચામાં ઊંચુ"
 
-#: ../mail/message-list.c:1614 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "આજે %l:%M %p"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "ગઈકાલે %l:%M %p"
 
-#: ../mail/message-list.c:1642 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1650 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1652 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:3849
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3885 ../mail/message-list.c:4321
 msgid "Generating message list"
 msgstr "સંદેશા યાદી બનાવી રહ્યા છીએ"
 
+#: ../mail/message-list.c:4176
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4178
+msgid "There are no messages in this folder."
+msgstr "આ ફોલ્ડરમાં સંદેશાઓ નથી."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "તારીખ પૂરી થઈ ગઈ"
@@ -14961,39 +15776,39 @@ msgstr "મોકલાયેલ સંદેશાઓ"
 msgid "Size"
 msgstr "માપ"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "બોલાવો"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "આગળ ધપાવો નહિં"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "ને અનુસરો"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "તમારી જાણકારી માટે"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "આગળ ધપાવો"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "કોઈ જવાબ જરુરી નથી"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "વળતો જવાબ"
 
-#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "બધાને વળતો જવાબ આપો"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "ઉપરછલ્લી સમજ"
 
@@ -15030,33 +15845,22 @@ msgid "Provides core functionality for local address books."
 msgstr "સ્થાનિક સરનામા પોથીઓ માટે મૂળ વિધેયો પૂરા પાડે છે."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "જોડાણ યાદ અપાવનાર પ્લગઈન સક્રિય કરો"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "જોડાણ યાદ અપાવનાર પ્લગઈન સક્રિય કરો."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
 msgstr "જોડાણ યાદ અપાવનાર પ્લગઈનને સંદેશા ભાગમાં જોવા માટેના ઈશારાઓની યાદી"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
 msgstr "જોડાણ યાદ અપાવનારર પ્લગઈન માટે સંદેશા ભાગમાં કડીઓની યાદી."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "મુખ્ય શબ્દો"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "ગુમ થયેલ જોડાણો યાદ અપાવો (_m)"
-
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
 msgid "Attachment Reminder"
@@ -15080,9 +15884,9 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "સંદેશાને કોઈ જોડાણો નથી"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "ફેરફાર ચાલુ રાખો (_C)"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
+msgstr "સંદેશામાં ફેરફાર કરો (_E)"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
@@ -15096,27 +15900,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "ઓડિયો ઈનલાઈન પ્લગઈન"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:107
 msgid "Select name of the Evolution backup file"
 msgstr "ઈવોલ્યુશન બેકઅપ ફાઈલનું નામ પસંદ કરો"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:136
 msgid "_Restart Evolution after backup"
 msgstr "બેકઅપ પછી ઈવોલ્યુશન ફરી શરૂ કરો (_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:159
 msgid "Select name of the Evolution backup file to restore"
 msgstr "પુનઃસંગ્રહ કરવા માટે ઈવોલ્યુશન બેકઅપ ફાઈલનું નામ પસંદ કરો"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after restore"
 msgstr "પુનઃ પ્રાપ્તિ પછી ઈવોલ્યુશન ફરીથી શરૂ કરો (_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:256
 msgid "Restore from backup"
 msgstr "બેકઅપમાંથી પુનઃસંગ્રહો"
 
-#: ../plugins/backup-restore/backup-restore.c:238
+#: ../plugins/backup-restore/backup-restore.c:258
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. \n"
@@ -15126,95 +15930,119 @@ msgstr ""
 "પુનઃસંગ્રહી શકે છે. \n"
 "તે તમારા બધા વ્યક્તિગત સુયોજનો, મેઈલ ગાળકો વગેરે પણ પુનઃસંગ્રહી શકશે."
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restore Evolution from the backup file"
 msgstr "બેકઅપ ફાઈલમાંથી ઈવોલ્યુશન પુનઃસંગ્રહો (_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:271
 msgid "Please select an Evolution Archive to restore:"
 msgstr "પુનઃસંગ્રહ કરવા માટે મહેરબાની કરીને ઈવોલ્યુશન પેટી પસંદ કરો:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:274
 msgid "Choose a file to restore"
 msgstr "પુનઃસંગ્રહવા માટે ફાઈલ પસંદ કરો"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "બેકઅપ ઈવોલ્યુશન ડિરેક્ટરી"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "ઈવોલ્યુશન ડિરેક્ટરી પાછી સંગ્રહિત કરો"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "ઈવોલ્યુશન બેકઅપ ચકાસો"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "ઈવોલ્યુશન ફરી શરૂ કરો"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr "ગ્રાફિકવાળા વપરાશકર્તા ઈન્ટરફેસ સાથે"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "ઈવોલ્યુશન બંધ કરી રહ્યા છીએ"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "ઈવોલ્યુશન ખાતાઓ અને સુયોજનો બેક કરી રહ્યા છીએ"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "ઈવોલ્યુશન માહિતી બેક કરી રહ્યા છીએ (મેઈલો, સંપર્કો, કેલેન્ડર, બાબતો, મેમો)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "બેકઅપ સમાપ્ત"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "ઈવોલ્યુશન પુનઃશરૂ કરી રહ્યા છીએ"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "વર્તમાન ઈવોલ્યુશન માહિતી બેકઅપ કરો"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "બેકઅપમાંથી ફાઈલોનો અર્ક કાઢી રહ્યા છીએ"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "ઈવોલ્યુશન સુયોજનો લાવી રહ્યા છીએ"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "કામચલાઉ બેકઅપ ફાઈલો દૂર કરી રહ્યા છીએ"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr "સ્થાનીય સ્ત્રોતોની ખાતરી કરી રહ્યા છીએ"
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "%s ફોલ્ડર સુધી બેકઅપ કરી રહ્યા છીએ"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "%s ફોલ્ડરમાંથી પુનઃસંગ્રહી રહ્યા છીએ"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "ઈવોલ્યુશન બેકઅપ"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "ઈવોલ્યુશન પુનઃસંગ્રહ"
 
+#: ../plugins/backup-restore/backup.c:494
+msgid "Backing up Evolution Data"
+msgstr "ઈવોલ્યુશન માહિતી બેકઅપ કરો"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:497
+msgid "Restoring Evolution Data"
+msgstr "ઈવોલ્યુશન માહિતી પુનઃસંગ્રહ કરી રહ્યા છીએ"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr "મહેરબાની કરીને રાહ જુઓ જ્યાં સુધી તમારી માહિતી પુન:સંગ્રહ કરી રહ્યા છે."
+
+#: ../plugins/backup-restore/backup.c:516
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr "ઈવોલ્યુશન માહિતી અને સુયોજનોની બેકઅપ લેવા માટે અને પાછા સંગ્રહવા પ્લગઈન."
@@ -15245,14 +16073,22 @@ msgstr ""
 "સક્રિય કરો."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Insufficient Permissions"
+msgstr "અપૂરતી પરવાનગીઓ"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "અયોગ્ય ઈવોલ્યુશન બેકઅપ ફાઈલ"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "પુનઃસંગ્રહ કરવા માટે મહેરબાની કરીને માન્ય બેકઅપ ફાઈલ પસંદ કરો."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "The selected folder is not writable."
+msgstr "પસંદિત ફોલ્ડર લખાતુ નથી."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
 "This will delete all your current Evolution data and settings and restore "
 "them from your backup. Evolution restore can start only when Evolution is "
@@ -15285,7 +16121,7 @@ msgstr "આપોઆપ સંપર્કો"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:565
-msgid "_Automatically create entries in the addressbook when responding to messages"
+msgid "_Auto-create addressbook entries when replying to messages"
 msgstr "જ્યારે સંદેશાઓનો વળતો જવાબ આપી રહ્યા હોય ત્યારે આપોઆપ પ્રવેશો બનાવો (_A)"
 
 #: ../plugins/bbdb/bbdb.c:571
@@ -15298,9 +16134,7 @@ msgstr "તુરંત સંદેશા સંપર્કો"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "Pidgin વ્યક્તિ યાદીમાંથી સામયિકપણે સંપર્ક જાણકારી અને ચિત્રોને સુમેળ કરે છે"
 
 #: ../plugins/bbdb/bbdb.c:607
@@ -15325,7 +16159,28 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#, fuzzy, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "છાપતી વખતે ભૂલ ઉદ્ભવી"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr "સંદેશા લખાણને યુનિકોડમાં રૂપાંતરિત કરો (_U)"
 
@@ -15346,6 +16201,10 @@ msgid "Bogofilter Options"
 msgstr "Bogofilter વિકલ્પો"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "Bogofilter નકામા પ્લગઇન"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "બગડેલ સંદેશાઓને Bogofilter ની મદદથી ગાળે છે."
 
@@ -15354,12 +16213,12 @@ msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:135
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:351
+#: ../plugins/google-account-setup/google-source.c:357
 msgid "Use _SSL"
 msgstr "_SSL વાપરો"
 
@@ -15379,17 +16238,17 @@ msgstr "સ્થાનિક કેલેન્ડરો"
 msgid "Provides core functionality for local calendars."
 msgstr "સ્થાનિક કેલેન્ડરો માટે મૂળ વિધેયો પૂરા પાડે છે."
 
-#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:375
-msgid "_Refresh:"
-msgstr "ફરીથી તાજુ કરો (_R):"
+#: ../plugins/google-account-setup/google-source.c:381
+msgid "Re_fresh:"
+msgstr "પુનઃતાજું કરો (_f):"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "સુરક્ષિત જોડાણ (_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "વપરાશકર્તાનામ (_m):"
 
@@ -15487,14 +16346,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "શું તમે ઈવોલ્યુશનને તમારું મૂળભુત ઈ-મેઈલ ક્લાઈન્ટ બનાવવા માંગો છો?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:626
+#: ../shell/main.c:679
 msgid "Evolution"
 msgstr "ઈવોલ્યુશન"
 
 #: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "મૂળભૂત ફોલ્ડર તરીકે ચિહ્નિત કરો (_d)"
+msgid "Mark as _default address book"
+msgstr "મૂળભૂત સરનામાં પોથી તરીકે ચિહ્નિત કરો (_d)"
+
+#: ../plugins/default-source/default-source.c:102
+msgid "Mark as _default calendar"
+msgstr "મૂળભૂત કેલેન્ડર તરીકે ચિહ્નિત કરો (_d)"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default task list"
+msgstr "મૂળભૂત કામ યાદી તરીકે ચિહ્નિત કરો (_d)"
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default memo list"
+msgstr "મૂળભૂત મેમો યાદી તરીકે ચિહ્નિત કરો (_d)"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -15506,6 +16376,50 @@ msgid ""
 "default one."
 msgstr "કેલેન્ડર અથવા સરનામાપુસ્તિકાને મૂળભૂત બનાવવા માટે ચિહ્નિત કરવા માટેનું વિધેય પૂરું પાડે છે."
 
+#: ../plugins/email-custom-header/email-custom-header.c:562
+msgid "_Custom Header"
+msgstr "વૈવિધ્યપૂર્ણ હેડર (_C)"
+
+#: ../plugins/email-custom-header/email-custom-header.c:883
+msgid "Key"
+msgstr "કી"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "કિંમતો"
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr "ઇમેઇલ વૈવિધ્યપૂર્ણ હેડર"
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Adds custom header to outgoing messages."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "વૈવિધ્યપૂર્ણ હેડર"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "વૈવિધ્યપૂર્ણ હેડરોની યાદી"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "અન્ય વપરાશકર્તાનું ફોલ્ડર ખોલો"
@@ -15523,32 +16437,32 @@ msgid "_User:"
 msgstr "વપરાશકર્તા (_U):"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "સુરક્ષિત પાસવર્ડ"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr "આ વિકલ્પ સુરક્ષિત પાસવર્ડ (NTLM) સત્તાધિકરણની મદદથી એક્સચેન્જ સર્વર સાથે જોડાશે."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "સાદા લખાણનો પાસવર્ડ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr "આ વિકલ્પ પ્રમાણભૂત સાદા લખાણના પાસવર્ડ સત્તાધિકરણની મદદથી એક્સચેન્જ સર્વર સાથે જોડાશે."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "ઓફિસની બહાર"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -15556,77 +16470,81 @@ msgstr ""
 "નીચે સ્પષ્ટ થયેલ સંદેશો આપોઆપ દરેક વ્યક્તિને મોકલાઈ જશે જેણે \n"
 "તમને તમે જ્યારે ઓફિસની બહાર હતા ત્યારે મેઈલ મોકલ્યા હતા."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "હું ઓફિસની બહાર છું"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "હું ઓફિસમાં છું"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "એક્સચેન્જ ખાતા માટે પાસવર્ડ બદલો"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "પાસવર્ડ બદલો"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "એક્સચેન્જ ખાતા માટે પ્રતિનિધી સુયોજનોની વ્યવસ્થા કરો"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "પ્રતિનિધી સહાય"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "મિશ્રિત"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "બધા એક્સચેન્જ ફોલ્ડરોનું માપ જુઓ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "ફોલ્ડરોનું માપ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "એક્સચેન્જ સુયોજનો"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "સત્તાધિકરણ કરો (_u)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "મેઈલબોક્સ (_M):"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "સત્તાધિકરણ પ્રકાર (_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "આધારભૂત પ્રકારો માટે ચકાસો (_e)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -15644,7 +16562,7 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
+#: ../plugins/exchange-operations/exchange-change-password.c:113
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
@@ -15652,7 +16570,7 @@ msgstr ""
 "વર્તમાન પાસવર્ડ તમારા ખાતાના હાલના પાસવર્ડ સાથે બંધબેસતો નથી. મહેરબાની કરીને યોગ્ય "
 "પાસવર્ડ દાખલ કરો"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:120
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "બે પાસવર્ડો બંધબેસતા નથી. મહેરબાની કરીને પાસવર્ડો પાછા-દાખલ કરો."
 
@@ -15679,33 +16597,33 @@ msgstr ""
 msgid "Your password will expire in the next %d days"
 msgstr "આગળના %d દિવસોમાં તમારા પાસવર્ડની સમયમર્યાદા સમાપ્ત થઈ જશે"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
 msgid "Custom"
 msgstr "વૈવિધ્યપૂર્ણ"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "સંપાદક (વાંચો, બનાવો, ફેરફાર કરો)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "લેખક (વાંચો, બનાવો)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "રીવ્યુ કરનાર (માત્ર-વાંચી શકાય તેવું)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "પ્રતિનિધી પરવાનગીઓ"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s માટે પરવાનગીઓ"
@@ -15713,7 +16631,7 @@ msgstr "%s માટે પરવાનગીઓ"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -15723,66 +16641,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 msgid "You have been given the following permissions on my folders:"
 msgstr "તમને મારા ફોલ્ડરો પર નીચેની પરવાનગીઓ આપવામાં આવેલ છે:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
 msgstr "તમને મારી ખાનગી વસ્તુઓ જોવાની પણ પરવાનગી આપવામાં આવેલ છે."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr "છતાંય તમને મારી ખાનગી વસ્તુઓ જોવા માટે પરવાનગી નથી."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "તમને %s માટે પ્રતિનીધીનો હોદ્દો આપવામાં આવેલ છે"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To"
 msgstr "પ્રતિનિધી પ્રતિ"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:580
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "શું પ્રતિનિધી %s દૂર કરવો છે?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "ક્રિયાશીલ ડિરેક્ટરી વાપરી શક્યા નહિં"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "ક્રિયાશીલ ડિરેક્ટરીમાં પોતાને શોધી શક્યા નહિં"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "પ્રતિનિધી %s ને ક્રિયાશીલ ડિરેક્ટરીમાં શોધી શક્યા નહિં"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "પ્રતિનિધી %s દૂર કરી શક્યા નહિં"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "પ્રિતિનિધીઓની યાદી સુધારી શક્યા નહિં."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "પ્રતિનિધી %s ઉમેરી શક્યા નહિં"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:981
 msgid "Error reading delegates list."
 msgstr "પ્રતિનિધી યાદી વાંચવામાં ભૂલ."
 
@@ -15830,20 +16748,25 @@ msgstr "પરવાનગીઓનો સાર આપો (_S)"
 msgid "_Tasks:"
 msgstr "બાબતો (_T):"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:59
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "પરવાનગીઓ..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
 msgid "Folder Name"
 msgstr "ફોલ્ડર નામ"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
 msgid "Folder Size"
 msgstr "ફોલ્ડર માપ"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+msgid "User"
+msgstr "વપરાશકર્તા"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "અન્ય વપરાશકર્તાઓના ફોલ્ડરમાં ઉમેદવારી નોંધાવો"
@@ -15852,20 +16775,20 @@ msgstr "અન્ય વપરાશકર્તાઓના ફોલ્ડર�
 msgid "Exchange Folder Tree"
 msgstr "એક્સચેન્જ ફોલ્ડર વૃક્ષ"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:235
-#: ../plugins/exchange-operations/exchange-folder.c:245
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:234
+#: ../plugins/exchange-operations/exchange-folder.c:244
 msgid "Unsubscribe Folder..."
 msgstr "ફોલ્ડરોની ઉમેદવારી દૂર કરો..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:519
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "શું ખરેખર ફોલ્ડર \"%s\" માંથી ઉમેદવારી દૂર કરવી છે?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:531
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" માંથી ઉમેદવારી દૂર કરો"
@@ -15929,15 +16852,18 @@ msgstr "૭ દિવસોમાં તમારા પાસવર્ડની
 msgid "_Change Password"
 msgstr "પાસવર્ડ બદલો (_C)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(પરવાનગી નથી.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
 msgid "Add User:"
 msgstr "વપરાશકર્તા ઉમેરો:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../plugins/groupwise-features/proxy.c:934
+#: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
 msgstr "વપરાશકર્તા ઉમેરો"
 
@@ -16059,11 +16985,11 @@ msgstr "વપરાશકર્તા (_U)"
 msgid "button-user"
 msgstr "બટન-વપરાશકર્તા"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "વપરાશકર્તા પસંદ કરો"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "સરનામા પુસ્તિકા..."
 
@@ -16077,7 +17003,7 @@ msgstr "અન્ય વપરાશકર્તાના કેલેન્ડ�
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
 msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
+"A plugin that manages a collection of Exchange account specific operations "
 "and features."
 msgstr "પ્લગઈન કે જે એક્સચેન્જ ખાતાને લગતી ચોક્કસ પ્રક્રિયાઓ અને લક્ષણોનો સમૂહ નિયંત્રિત કરે છે."
 
@@ -16168,10 +17094,14 @@ msgid "Could not update out-of-office state"
 msgstr "ઓફિસ-ની-બહાર સ્થિતિ સુધારી શક્યા નહિં"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "એક્સચેન્જ ખાતું ઓફલાઈન છે"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16199,32 +17129,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "પ્રતિનિધીઓ સુધારવામાં નિષ્ફળ:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "ફોલ્ડર પહેલાથી જ હાજર છે"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "ફોલ્ડર અસ્તિત્વમાં નથી"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "ફોલ્ડર ઓફલાઈન"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "સામાન્ય ભૂલ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "વૈશ્વિક કેટલોગ સર્વર પહોંચી શકાય એવું નથી"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -16232,73 +17162,73 @@ msgstr ""
 "જો OWA એ અલગ પાથ પર ચાલી રહેલ હોય, તો તમારે તેને ખાતા રૂપરેખાંકન સંવાદમાં સ્પષ્ટ કરવું જ "
 "પડશે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "{0} માટેનું મેઈલબોક્સ એ આ સર્વર પર નથી."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "URL યોગ્ય છે એની ખાતરી કરો અને ફરીથી પ્રયત્ન કરો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "સર્વર નામની જોડણી યોગ્ય રીતે લખાયેલી છે તેની ખાતરી કરો અને ફરીથી પ્રયત્ન કરો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr "વપરાશકર્તા નામ અને પાસવર્ડ યોગ્ય છે તેની ખાતરી કરો અને ફરીથી પ્રયત્ન કરો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "કોઈ વૈશ્વિક કેટેલોગ સર્વર આ ખાતા માટે રૂપરેખાંકિત થયેલ નથી."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "વપરાશકર્તા {0} માટે {1} પર કોઈ મેઈલબોક્સ નથી."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "આવો કોઈ વપરાશકર્તા {0} નથી"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "પાસવર્ડ સફળતાપૂર્વક બદલાઈ ગયો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 "મહેરબાની કરીને પ્રતિનીધીનું ID દાખલ કરરો અથવા પ્રતિનીધી તરીકે મોકલો વિકલ્પની પસંદગી "
 "દૂર કરો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "મહેરબાની કરીને ખાતરી કરો કે વૈશ્વિક કેટલોગ સર્વર નામ યોગ્ય છે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "ફેરફારોની અસર જોવા માટે મહેરબાની કરીને ઈવોલ્યુશન પુનઃશરૂ કરો"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "મહેરબાની કરીને વપરાશકર્તા પસંદ કરો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "સર્વરે પાસવર્ડ નકાર્યો કારણ કે તે ખૂબ નબળો છે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "એક્સચેન્જ ખાતું નિષ્ક્રિય કરવામાં આવશે જ્યારે તમે ઈવોલ્યુશનમાંથી બહાર નીકળો"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "એક્સચેન્જ ખાતું દૂર કરવામાં આવશે જ્યારે તમે ઈવોલ્યુશનમાંથી બહાર નીકળો"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "એક્સચેન્જ સર્વર એક્સચેન્જ કનેક્ટર સાથે સુસંગત નથી"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -16306,7 +17236,7 @@ msgstr ""
 "સર્વર Exchange 5.5 ચલાવી રહેલ છે. એક્સચેન્જ કનેક્ટર \n"
 "એ Microsoft Exchange 2000 અને 2003 ને જ માત્ર આધાર આપે છે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -16320,57 +17250,57 @@ msgstr ""
 "\n"
 "અથવા કદાચ તમે તમારો પાસવર્ડ ખોટો લખ્યો હશે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "અલગ પાસવર્ડ સાથે ફરીથી પ્રયત્ન કરો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "વપરાશકર્તાને વપરાશ નિયંત્રણ યાદીમાં ઉમેરવામાં અસમર્થ:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "પ્રતિનિધીઓમાં ફેરફાર કરવામાં અસમર્થ."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "{0} જોવામાં અજ્ઞાત ભૂલ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error."
 msgstr "અજ્ઞાત ભૂલ."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "અજ્ઞાત પ્રકાર"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "બિનઆધારભૂત પ્રક્રિયા"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "તમે આ સર્વર પર મેઈલ સંગ્રહવા માટે ઉપલબ્ધ ક્વોટા નજીક કરી રહ્યા છો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr "તમને એક સમયે માત્ર એક પ્રતિનીધીના વતી જ સંદેશો મોકલવાની પરવાનગી છે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "તમે તમારી પોતાની જાતે પ્રતિનિધી બની શકો નહિં"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "તમે આ સર્વર પર મેઈલ સંગ્રહવા માટે ક્વોટાની મર્યાદા ઓળંગી દીધી છે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "તમે માત્ર એક એક્સચેન્જ ખાતું રૂપરેખાંકિત કરી શકો છો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -16378,7 +17308,7 @@ msgstr ""
 "તમારો વર્તમાન વપરાશ: {0} KB છે. અમુક મેઈલ કાઢી નાંખીને થોડી જગ્યા સાફ કરવાનો પ્રયત્ન "
 "કરો."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -16386,7 +17316,7 @@ msgstr ""
 "તમારો વર્તમાન વપરાશ: {0} KB છે. તમે ક્યાં તો મેઈલો મોકલવા માટે કે મેળવવા માટે સમર્થ હશો "
 "નહિં."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -16394,19 +17324,19 @@ msgstr ""
 "તમારો વર્તમાન વપરાશ: {0} KB છે. તમે જ્યાં સુધી અમુક મેઈલો કાઢી નાંખીને અમુક જગ્યા ખાલી "
 "કરો નહિં ત્યાં સુધી મેઈલો મોકલવા માટે સમર્થ હશો નહિં."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "તમારા પાસવર્ડની મર્યાદા સમાપ્ત થઈ ગઈ છે."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} એ વપરાશ નિયંત્રણ યાદીમાં ઉમેરી શકાતું નથી"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} એ પહેલાથી જ પ્રતિનિધી છે"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} એ પહેલાથી જ યાદીમાં છે"
 
@@ -16418,34 +17348,74 @@ msgstr "અન્ય વપરાશકર્તાની બાબતોમા�
 msgid "Check folder permissions"
 msgstr "ફોલ્ડર પરવાનગીઓ ચકાસો"
 
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "મૂળભૂત બાહ્ય સંપાદક"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr "મૂળભૂત આદેશ કે જે સંપાદક તરીકે જ વપરાયેલ હોવો જોઇએ."
+
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
 "A plugin for using an external editor as the composer. You can send only "
 "plain-text messages."
-msgstr "કમ્પોઝર તરીકે બાહ્ય સંપાદક વાપરવા માટેનું પ્લગઈન. તમે માત્ર સાદા-લખાણ સંદેશાઓ જ મોકલી શકો છો."
+msgstr ""
+"કમ્પોઝર તરીકે બાહ્ય સંપાદક વાપરવા માટેનું પ્લગઈન. તમે માત્ર સાદા-લખાણ સંદેશાઓ જ મોકલી "
+"શકો છો."
 
 #. the path to the shared library
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
 msgid "External Editor"
 msgstr "બાહ્ય સંપાદક"
 
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "કામચલાઉ ફાઇલ બનાવી શકતા નથી."
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "બાહ્ય સંપાદકમાં કમ્પોઝ કરો"
+msgid "Compose in _External Editor"
+msgstr "બાહ્ય સંપાદકમાં કમ્પોઝ કરો (_E)"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "બાહ્ય સંપાદકની મદદથી સંદેશાઓ કમ્પોઝ કરો"
 
-#: ../plugins/face/face.c:57
+#: ../plugins/external-editor/external-editor.c:91
+msgid "Command to be executed to launch the editor: "
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:92
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+
+#: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "< 700bytes માપની (48*48) png પસંદ કરો"
 
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:68
 msgid "PNG files"
 msgstr "PNG ફાઈલો"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:125
 msgid "_Face"
 msgstr "ફેસ (_F)"
 
@@ -16454,7 +17424,10 @@ msgid ""
 "Attach Face header to outgoing messages. First time the user needs to "
 "configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
 "faces This will be used in messages that are sent further."
-msgstr "જતા સંદેશાઓ સાથે ફેસ હેડર જોડો. પ્રથમ સમયે વપરાશકર્તાને 48*48 png ચિત્ર રૂપરેખાંકિત કરવાની જરૂર છે. તે base64 એનકોડ થયેલ છે અને ~/.evolution/faces માં સંગ્રહિત થયેલ હોય છે. આ સંદેશાઓમાં વાપરવામાં આવશે કે જેઓ ભવિષ્યમાં મોકલાશે."
+msgstr ""
+"જતા સંદેશાઓ સાથે ફેસ હેડર જોડો. પ્રથમ સમયે વપરાશકર્તાને 48*48 png ચિત્ર રૂપરેખાંકિત "
+"કરવાની જરૂર છે. તે base64 એનકોડ થયેલ છે અને ~/.evolution/faces માં સંગ્રહિત થયેલ હોય "
+"છે. આ સંદેશાઓમાં વાપરવામાં આવશે કે જેઓ ભવિષ્યમાં મોકલાશે."
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
@@ -16477,20 +17450,38 @@ msgstr "ફોલ્ડરોમાંથી ઉમેદવારી દૂર
 msgid "_Unsubscribe"
 msgstr "ઉમેદવારી દૂર કરો (_U)"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:73
+#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+msgid "<b>Server</b>"
+msgstr "<b>સર્વર</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+msgid "Username:"
+msgstr "વપરાશકર્તા નામ:"
+
+#. Translators: This is the first half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
+#: ../plugins/google-account-setup/google-contacts-source.c:233
+msgid "Update every"
+msgstr "બધા સુધારો"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "google કેલેન્ડર સુયોજીત કરવા માટેનું પ્લગઈન."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "google કેલેન્ડર અને સંપર્કો સુયોજીત કરવા માટેનું પ્લગઈન."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Google સ્રોતો"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
 msgstr "ચકાસણી યાદી"
 
@@ -16570,10 +17561,20 @@ msgid "_Junk List"
 msgstr "જંક યાદી (_J)"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr "સંદેશા પાછા ખેંચવા"
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr "સંદેશો સફળતાપૂર્વક મેળવાયો"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "મેઈલ રીટ્રેક્ટ કરો"
 
@@ -16581,12 +17582,6 @@ msgstr "મેઈલ રીટ્રેક્ટ કરો"
 msgid "Add Send Options to groupwise messages"
 msgstr "જૂથપ્રમાણે સંદેશાઓને મોકલવા માટેના વિકલ્પો ઉમેરો"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "મોકલોના વિકલ્પો"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Groupwise ખાતાઓમાં લક્ષણો માટેનું પ્લગઈન."
@@ -16595,6 +17590,71 @@ msgstr "Groupwise ખાતાઓમાં લક્ષણો માટેનુ
 msgid "Groupwise Features"
 msgstr "Groupwise લક્ષણો"
 
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+msgid "Message retract failed"
+msgstr "સંદેશો પાછા ખેંચવામાં નિષ્ફળતા"
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+msgid "The server did not allow the selected message to be retracted."
+msgstr "પસંદ કરેલ સંદેશો પાછા ખેંચાયેલ છે તેને સર્વર પરવાનગી આપતુ નથી."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+msgid "Invalid user"
+msgstr "અયોગ્ય વપરાશકર્તા"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "વપરાશકર્તા &quot;{0}&quot; માં પ્રોક્સી પ્રવેશ આપી શકાતો નથી"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+msgid "Specify User"
+msgstr "વપરાશકર્તાને સ્પષ્ટ કરો"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+msgid "You have already given proxy permissions to this user."
+msgstr "તમને આ વપરાશકર્તામાં પ્રોક્સીની પરવાનગી પહેલેથી આપેલ છે."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "&quot;{0}&quot; ખાતુ પહેલેથી જ હાજર છે. મહેરબાની કરીને ફોલ્ડર ટ્રી ચકાસો."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+msgid "Account Already Exists"
+msgstr "ખાતુ પહેલાથી જ હાજર છે"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr "આ રીકરીંગ બેઠક છે"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+msgid "Would you like to accept it?"
+msgstr "શું તમે તેને સ્વીકારવાનું ગમે છે?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "Would you like to decline it?"
+msgstr "શું તમે તેનું પતન થાય તેવું ગમે છે?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "સ્પષ્ટ થયેલ વપરાશકર્તા &quot;{0}&quot; સાથે તમે ફોલ્ડરને વહેંચી શકતા નથી"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+msgid "You have to specify a user name whom you want to add to the list"
+msgstr ""
+
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
 msgstr "કસોટી માટે સ્વીકારો"
@@ -16693,9 +17753,9 @@ msgstr "<b>ખાતા નામ</b>"
 msgid "Proxy Login"
 msgstr "પ્રોક્સી પ્રવેશ"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -16704,20 +17764,20 @@ msgstr "%s%s માટે પાસવર્ડ દાખલ કરો (વપ�
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:521
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "પ્રોક્સી પ્રવેશ (_P)..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "પ્રોક્સી ટેબ માત્ર ત્યારે જ ઉપલબ્ધ હશે જ્યારે ખાતું ઓનલાઈન હોય."
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "પ્રોક્સી ટેબ માત્ર ત્યારે ઉપલબ્ધ હશે જ્યારે ખાતું સક્રિય કરેલ હોય."
 
 #: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "વપરાશકર્તાઓ"
 
@@ -16733,11 +17793,15 @@ msgstr "નવું વહેંચાયેલ ફોલ્ડર (_S)..."
 msgid "Sharing"
 msgstr "વહેંચી રહ્યા છીએ"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "વૈવિધ્યપૂર્ણ સૂચન"
+
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "ઉમેરો   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "સુધારો"
 
@@ -16802,11 +17866,11 @@ msgstr "hula કેલેન્ડર સ્રોતો સુયોજિત �
 msgid "Hula Account Setup"
 msgstr "Hula ખાતા સુયોજન"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "વૈવિધ્યપૂર્ણ હેડરો"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP હેડરો"
 
@@ -16859,28 +17923,28 @@ msgstr "IMAP ખાતાઓમાં લક્ષણો માટેનું �
 msgid "IMAP Features"
 msgstr "IMAP લક્ષણો"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "કેલેન્ડરમાં આયાત કરો (_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "બાબતોમાં આયાત કરો"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "ICS આયાત કરો"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "બાબત યાદી પસંદ કરો"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "કેલેન્ડર પસંદ કરો"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:263
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../shell/e-shell-importer.c:700
 msgid "_Import"
 msgstr "આયાત (_I)"
 
@@ -16917,8 +17981,8 @@ msgstr ""
 "ઈવોલ્યુશન તેની સાથે સુમેળ કરવા માટે iPod શોધી શક્યું નહિં. ક્યાં તો iPod સિસ્ટમ સાથે જોડાયેલ "
 "નહિં હોય અથવા તેનો પાવર ચાલુ થયેલ નહિં હશે."
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar બંધારણ (.ics)"
 
@@ -16934,142 +17998,142 @@ msgstr "iPod સાથે સુમેળ કરો"
 msgid "iPod Synchronization"
 msgstr "iPod સુમેળ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:439
-#: ../plugins/itip-formatter/itip-formatter.c:564
+#: ../plugins/itip-formatter/itip-formatter.c:444
+#: ../plugins/itip-formatter/itip-formatter.c:569
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "કેલેન્ડર '%s' લાવવામાં નિષ્ફળ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:584
+#: ../plugins/itip-formatter/itip-formatter.c:589
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "કેલેન્ડર '%s' માંની મુલાકાત આ મંત્રણા સાથે તકરાર થાય છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:610
+#: ../plugins/itip-formatter/itip-formatter.c:615
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "કેલેન્ડર '%s' માં મુલાકાત મળી"
 
-#: ../plugins/itip-formatter/itip-formatter.c:686
+#: ../plugins/itip-formatter/itip-formatter.c:691
 msgid "Unable to find any calendars"
 msgstr "કોઈપણ કેલેન્ડર શોધવામાં અસમર્થ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:693
+#: ../plugins/itip-formatter/itip-formatter.c:698
 msgid "Unable to find this meeting in any calendar"
 msgstr "કોઈપણ કેલેન્ડરમાં આ મંત્રણા શોધવામાં અસમર્થ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:702
 msgid "Unable to find this task in any task list"
 msgstr "કોઈપણ બાબત યાદીમાં આ બાબત શોધવામાં અસમર્થ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:706
 msgid "Unable to find this memo in any memo list"
 msgstr "કોઈપણ મેમો યાદીમાંથી આ મેમો શોધવામાં અસમર્થ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:772
+#: ../plugins/itip-formatter/itip-formatter.c:777
 msgid "Searching for an existing version of this appointment"
 msgstr "આ મુલાકાતની તાજેતરની આવૃત્તિ માટે શોધ કરી રહ્યા છીએ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:935
+#: ../plugins/itip-formatter/itip-formatter.c:946
 msgid "Unable to parse item"
 msgstr "વસ્તુનું પદચ્છેદ કરવામાં અસમર્થ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:993
+#: ../plugins/itip-formatter/itip-formatter.c:1004
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "કેલેન્ડર '%s' ને વસ્તુ મોકલવામાં અસમર્થ.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:1016
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "કેલેન્ડર '%s' ને સ્વીકારાયેલ તરીકે મોકલાયેલ છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1009
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "કેલેન્ડર '%s' ને ચોક્કસ નથી એમ મોકલાયેલ છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1014
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "કેલેન્ડર '%s' ને નકારાઈ ગયેલ છે એ રીતે મોકલાયેલ છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1030
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "કેલેન્ડર '%s' ને રદ કરાયેલ તરીકે મોકલાયેલ છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1113
+#: ../plugins/itip-formatter/itip-formatter.c:1124
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "આયોજકે પ્રતિનિધી %s ને દૂર કરી નાંખ્યો "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1120
+#: ../plugins/itip-formatter/itip-formatter.c:1131
 msgid "Sent a cancelation notice to the delegate"
 msgstr "પ્રતિનિધીને રદ કરવાનું સૂચન મોકલ્યું છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1122
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "પ્રતિનિધીને રદ કરવાનું સૂચન મોકલી શક્યા નહિં"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1207
+#: ../plugins/itip-formatter/itip-formatter.c:1219
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "સભાજન સ્થિતિ સુધારી શકાઈ નહિં કારણ કે સ્થિતિ અયોગ્ય છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1246
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "સભાજન સુધારવામાં અસમર્થ. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1250
 msgid "Attendee status updated"
 msgstr "સભાજન સ્થિતિ સુધારાઈ ગઈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1263
+#: ../plugins/itip-formatter/itip-formatter.c:1276
 msgid "Meeting information sent"
 msgstr "મંત્રણા જાણકારી મોકલાઈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1266
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid "Task information sent"
 msgstr "બાબત જાણકારી મોકલાઈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1269
+#: ../plugins/itip-formatter/itip-formatter.c:1282
 msgid "Memo information sent"
 msgstr "મેમો જાણકારી મોકલાઈ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1291
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "મંત્રણા જાણકારી મોકલવામાં અસમર્થ, મંત્રણા અસ્તિત્વમાં નથી"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1294
 msgid "Unable to send task information, the task does not exist"
 msgstr "બાબત જાણકારી મોકલવામાં અસમર્થ, બાબત અસ્તિત્વમાં નથી"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1284
+#: ../plugins/itip-formatter/itip-formatter.c:1297
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "મેમો જાણકારી મોકલવામાં અસમર્થ, મેમો અસ્તિત્વમાં નથી"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1359
-#: ../plugins/itip-formatter/itip-formatter.c:1374
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid "The calendar attached is not valid"
 msgstr "જોડાયેલ કેલેન્ડર માન્ય નથી"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1360
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1367
+#: ../plugins/itip-formatter/itip-formatter.c:1378
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "સંદેશો કેલેન્ડર સમાવવા માટે દાવો મૂકે છે, પરંતુ કેલેન્ડર એ માન્ય iCalendar નથી."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1410
-#: ../plugins/itip-formatter/itip-formatter.c:1428
-#: ../plugins/itip-formatter/itip-formatter.c:1510
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "The item in the calendar is not valid"
 msgstr "કેલેન્ડરની વસ્તુ માન્ય નથી"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1411
-#: ../plugins/itip-formatter/itip-formatter.c:1429
-#: ../plugins/itip-formatter/itip-formatter.c:1511
+#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1437
+#: ../plugins/itip-formatter/itip-formatter.c:1519
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17077,324 +18141,324 @@ msgstr ""
 "સંદેશો કેલેન્ડર સમાવતો નથી, પરંતુ કેલેન્ડર કોઈ ઘટનાઓ સમાવતું નથી, બાબતો અથવા મુક્ત/વ્યસ્ત "
 "જાણકારી"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1440
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "The calendar attached contains multiple items"
 msgstr "જોડાયેલ કેલેન્ડર ઘણી વસ્તુઓ સમાવે છે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1441
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "આ બધી વસ્તુઓ પર પ્રક્રિયા કરવા માટે, ફાઈલ સંગ્રહાવી જોઈએ અને કેલેન્ડર આયાત થવું જોઈએ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2138
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "આ મંત્રણા ફરી થશે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2141
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "આ બાબત ફરી થશે"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2144
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "આ મેમો ફરી થશે"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "ક્રિયા કર્યા પછી સંદેશો કાઢી નાંખો (_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2369
-#: ../plugins/itip-formatter/itip-formatter.c:2401
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "તકરાર શોધ"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2384
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "મંત્રણા મતભેદો શોધવા માટે કેલેન્ડર પસંદ કરો"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "આજે"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:195
 msgid "Today %H:%M"
 msgstr "આજે %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:199
 msgid "Today %H:%M:%S"
 msgstr "આજે %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:208
 msgid "Today %l:%M:%S %p"
 msgstr "આજે %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:218
 msgid "Tomorrow"
 msgstr "આવતી કાલે"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow %H:%M"
 msgstr "આવતી કાલે %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:227
 msgid "Tomorrow %H:%M:%S"
 msgstr "આવતી કાલે %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %l:%M %p"
 msgstr "આવતી કાલે %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:236
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "આવતી કાલે %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../plugins/itip-formatter/itip-view.c:255
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:260
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:266
+#: ../plugins/itip-formatter/itip-view.c:264
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:275
+#: ../plugins/itip-formatter/itip-view.c:273
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:288
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:292
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:307
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:316
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:325
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:526
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "મહેરબાની કરીને <b>%s</b> ના વતી પ્રત્યુત્તર આપો"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "<b>%s</b> ના વતી મેળવવામાં આવ્યો"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:357
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> મારફતે %s એ નીચેની મંત્રણા જાણકારી પ્રકાશિત કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:359
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> એ નીચેની મંત્રણા જાણકારી પ્રકાશિત કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> એ નીચેની મંત્રણાનું તમારા માટે આયોજન કર્યું છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> મારફતે %s એ તમારી નીચેની મંત્રણામાં હાજરીની માંગણી કરી છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> એ તમારી નીચેની મંત્રણામાં હાજરીની માંગણી કરી છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:375
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> મારફતે %s હાલની મંત્રણા ઉમેરવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:377
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> હાલની મંત્રણા ઉમેરવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 msgstr "<b>%s</b> એ %s મારફતે નીચેની મંત્રણા માટેની તાજેતરની જાણકારી પ્રાપ્ત કરવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> નીચેની મંત્રણા માટે તાજેતરની જાણકારી મેળવવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:387
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> એ %s મારફતે નીચેનો મંત્રણા પ્રત્યુત્તર મોકલ્યો છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:389
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> એ નીચેની મંત્રણા પ્રત્યુત્તર પાછો મોકલ્યો:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:393
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> મારફતે %s એ નીચેની મંત્રણા રદ કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:395
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> એ નીચેની મંત્રણા રદ કરી."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:399
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> એ %s મારફતે નીચેના મંત્રણા ફેરફારો મૂક્યા છે."
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:401
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> એ નીચેના મંત્રણા ફેરફારોનો પ્રસ્તાવ મૂક્યો છે."
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:405
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> મારફતે %s એ નીચેના મંત્રણા ફેરફારો નકાર્યા છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:407
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> એ નીચેના મંત્રણા ફેરફારો નકાર્યા છે."
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:445
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> મારફતે %s એ નીતેની બાબત પ્રકાશિત કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> એ નીચેની બાબત પ્રકાશિત કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> એ %s પાસેથી નીચેની બાબતોની સોંપણીની માંગણી કરે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:455
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> મારફતે %s એ તમને બાબત સોંપી છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> એ તમને બાબત સોંપી છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:463
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> મારફતે %s હાલની બાબત ઉમેરવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:465
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> હાલની બાબત ઉમેરવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17403,134 +18467,134 @@ msgstr ""
 "<b>%s</b> એ %s મારફતે નીચેની સોંપાયેલ બાબત વિશે તાજેતરની જાણકારી મેળવવાની ઈચ્છા રાખે "
 "છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:471
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> નીચેની સોંપાયેલ બાબતો માટે તાજેતરની જાણકારી મેળવવા ઈચ્છે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:475
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "%2$s મારફતે <b>%1$s</b> એ નીચેની સોંપાયેલ ક્રિયા પ્રત્યુત્તર મોકલ્યો હતો:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:477
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> એ નીચેની સોંપાયેલી બાબતોનો પ્રત્યુત્તર પાછો મોકલ્યો:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:481
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> મારફતે %s એ નીચેની સોંપાયેલ બાબતો રદ કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:483
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> એ નીચેની સોંપાયેલ બાબતો રદ કરી:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:487
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> એ %s મારફતે નીચેની બાબત સોંપણી ફેરફારોની અરજી મૂકી છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:489
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> એ નીચેની બાબત સોંપમી ફેરફારોનો પ્રસ્તાવ મૂક્યો:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:493
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> મારફતે %s એ નીચેની સોંપાયેલ બાબતો નકારી:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:495
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> નીચેની સોંપણી બાબતને નકારી:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:533
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> મારફતે %s એ નીચેનો મેમો પ્રકાશિત કર્યો:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> એ નીચેનો મેમો પ્રકાશિત કર્યો:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:540
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> મારફતે %s હાલનો મેમો ઉમેરવાની ઈચ્છા રાખે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> વર્તમાન મેમો ઉમેરવાની ઈચ્છા રાખે છે:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> મારફતે %s એ નીચેનો વહેંચાયેલ મેમો રદ કર્યો:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> એ નીચેનો વહેંચાયેલ મેમો રદ કર્યો:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:819
 msgid "_Open Calendar"
 msgstr "કેલેન્ડર ખોલો (_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:852
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Decline"
 msgstr "નકારો (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:826
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Accept"
 msgstr "સ્વીકારો (_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Decline all"
 msgstr "બધું નામંજૂર કરો (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Tentative all"
 msgstr "બધું અજમાયશ માટે કરો (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:836
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Tentative"
 msgstr "અજમાયશ (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Accept all"
 msgstr "બધું સ્વીકારો (_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Send Information"
 msgstr "જાણકારી મોકલો (_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Update Attendee Status"
 msgstr "સભાજન પરિસ્થિતિ સુધારો (_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:849
 msgid "_Update"
 msgstr "સુધારો (_U)"
 
@@ -17631,8 +18695,10 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "જ્યારે નવા સંદેશાઓ આવે ત્યારે D-Bus સંદેશો પેદા કરે છે."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "If true, then beep, otherwise will play sound file when new messages arrive."
-msgstr "જો સાચું હોય, તો પછી બીપ વગાડો, નહિંતર જ્યારે નવા સંદેશાઓ આવે ત્યારે ધ્વનિ ફાઈલ વગાડો."
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr "જો \"સાચું\" હોય, તો પછી બીપ વગાડો, નહિંતર જ્યારે નવા સંદેશાઓ આવે ત્યારે ધ્વનિ ફાઈલ વગાડો."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -17674,12 +18740,20 @@ msgstr "શું ચિહ્ન ઝબૂકવું જોઈએ કે ન�
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "શું માત્ર ઈનબોક્સ ફોલ્ડરમાં જ નવા સંદેશાઓ માટે સૂચન કરવું."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "_D-Bus સંદેશો બનાવો"
 
+#: ../plugins/mail-notification/mail-notification.c:378
+msgid "Evolution's Mail Notification"
+msgstr "ઇવોલ્યુશનની મેઈલ સૂચના"
+
+#: ../plugins/mail-notification/mail-notification.c:399
+msgid "Mail Notification Properties"
+msgstr "મેઈલ સૂચન ગુણધર્મો"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17694,55 +18768,55 @@ msgstr[1] ""
 "તમે %d નવા સંદેશાઓ\n"
 "%s માં મેળવ્યો છે."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:463
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "તમે %d નવો સંદેશો મેળવ્યો છે."
 msgstr[1] "તમે %d નવા સંદેશાઓ મેળવ્યો છે."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
 msgid "New email"
 msgstr "નવો મેઈલ"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:542
 msgid "Show icon in _notification area"
 msgstr "સૂચન વિસ્તારમાં ચિહ્ન બતાવો (_n)"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:545
 msgid "B_link icon in notification area"
 msgstr "સૂચન વિસ્તારમાં ચિહ્ન ઝબૂકાવો (_i)"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:547
 msgid "Popup _message together with the icon"
 msgstr "ચિહ્ન સાથે પોપઅપ સંદેશો આપો (_m)"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:728
 msgid "_Play sound when new messages arrive"
 msgstr "જ્યારે નવા સંદેશાઓ આવે ત્યારે ધ્વનિ વગાડો (_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "_Beep"
 msgstr "બીપ (_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:735
 msgid "Play _sound file"
 msgstr "ધ્વનિ ફાઈલ વગાડો (_s)"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Specify _filename:"
 msgstr "ફાઈલ નામ સ્પષ્ટ કરો (_f):"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Select sound file"
 msgstr "ધ્વનિ ફાઈલ પસંદ કરો"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Pl_ay"
 msgstr "વગાડો (_a)"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:805
 msgid "Notify new messages for _Inbox only"
 msgstr "માત્ર ઈનબોક્સ માટે જ નવા સંદેશાઓનું સૂચન કરો (_I)"
 
@@ -17750,7 +18824,9 @@ msgstr "માત્ર ઈનબોક્સ માટે જ નવા સં�
 msgid ""
 "Generates a D-Bus message or notifies the user with an icon in notification "
 "area and a notification message whenever a new message has arrived."
-msgstr "D-Bus સંદેશો પેદા કરે છે અથવા વપરાશકર્તાને સૂચન વિસ્તારમાં ચિહ્ન સાથે વપરાશકર્તાને સૂચન કરે છે અને સંદેશાને સૂચન કરે છે જ્યારેપણ નવો સંદેશો આવે."
+msgstr ""
+"D-Bus સંદેશો પેદા કરે છે અથવા વપરાશકર્તાને સૂચન વિસ્તારમાં ચિહ્ન સાથે વપરાશકર્તાને સૂચન કરે "
+"છે અને સંદેશાને સૂચન કરે છે જ્યારેપણ નવો સંદેશો આવે."
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
@@ -17779,7 +18855,9 @@ msgstr "કેલેન્ડર ખોલી શકતા નથી. %s"
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
-msgstr "પસંદિત સ્રોત માત્ર વાંચી શકાય તેવો છે, આથી ત્યાં ક્રિયા બનાવી શકતા નથી. અન્ય સ્રોત પસંદ કરો, મહેરબાની કરીને."
+msgstr ""
+"પસંદિત સ્રોત માત્ર વાંચી શકાય તેવો છે, આથી ત્યાં ક્રિયા બનાવી શકતા નથી. અન્ય સ્રોત પસંદ "
+"કરો, મહેરબાની કરીને."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid ""
@@ -17883,7 +18961,7 @@ msgstr "મેઈલિંગ યાદીને ઈ-મેઈલ સંદે�
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -17964,6 +19042,26 @@ msgstr "યાદીમાં ઉમેદવારી નોંધાવો (_S
 msgid "_Unsubscribe from List"
 msgstr "યાદીમાંથી ઉમેદવારી દૂર કરો (_U)"
 
+#: ../plugins/mark-all-read/mark-all-read.c:37
+msgid "Mark all messages in this folder and subfolders as read?"
+msgstr "શું આ ફોલ્ડર અને ઉપફોલ્ડરોમાંના બંધા સંદેશાઓને વંચાયેલ ચિહ્નિત કરવા માંગો છો?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+msgid "Do you want the operation to be performed also in the subfolders?"
+msgstr "શું તમે ઉપફોલ્ડરોમાં પણ પ્રક્રિયા કરવા માંગો છો?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:85
+msgid "Mark All Messages as Read"
+msgstr "બધા સંદેશાઓને વાંચ્યા એમ ચિહ્નિત કરો"
+
+#: ../plugins/mark-all-read/mark-all-read.c:162
+msgid "Current Folder and _Subfolders"
+msgstr "વર્તમાન ફોલ્ડર અને ઉપફોલ્ડર (_S)"
+
+#: ../plugins/mark-all-read/mark-all-read.c:174
+msgid "Current _Folder Only"
+msgstr "વર્તમાન ફોલ્ડર ફક્ત (_F)"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "બધાને વાંચ્યા એમ નિશાનિત કરો"
@@ -18006,7 +19104,7 @@ msgstr "કયા પ્લગઈનો સક્રિય કરેલ છે �
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "પ્લગઈન વ્યવસ્થાપક"
 
@@ -18018,33 +19116,24 @@ msgstr "પ્લગઈનો સક્રિય અને નિષ્ક્ર
 msgid "_Plugins"
 msgstr "પ્લગઈનો (_P)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:42
 msgid "Author(s)"
 msgstr "લેખકો"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "વર્ણન"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "રુપરેખાંકન"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "નોંધ: જ્યાં સુધી ફરી શરૂ થાય નહિં ત્યાં સુધી અમુક ફેરફારોઅસર લાવશે નહિં"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
 msgstr "ઝાંખી"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "રુપરેખાંકન"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "આ પ્લગઈન માટે કોઈ રૂપરેખાંકન વિકલ્પ નથી."
-
-#: ../plugins/plugin-manager/plugin-manager.c:330
-#: ../plugins/plugin-manager/plugin-manager.c:392
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "પ્લગઈન"
 
@@ -18069,41 +19158,22 @@ msgstr "સાદી લખાણ સ્થિતિ"
 msgid "Prefer plain-text"
 msgstr "સાદું-લખાણને પ્રાધાન્ય આપો"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
 msgstr "HTML બતાવો જો હાજર હોય તો"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
 msgstr "સાદાને પ્રાધાન્ય આપો"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:176
 msgid "Only ever show PLAIN"
 msgstr "હંમેશા સાદુ જ બતાવો"
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:219
 msgid "HTML _Mode"
 msgstr "HTML સ્થિતિ (_M)"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr "કમ્પોઝરમાંથી છાપવા માટે વિકલ્પ આપે છે."
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "સંદેશો છાપો"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "છાપનનું પૂર્વદર્શન (_v)"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "સંદેશો છાપો"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "ઈવોલ્યુશન રૂપરેખાકાર"
@@ -18128,13 +19198,7 @@ msgstr "સ્થાનો"
 msgid "_Publish Calendar Information"
 msgstr "કેલેન્ડર જાણકારી પ્રકાશિત કરો (_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "`%s' માટે પાસવર્ડ દાખલ કરો"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "શું તમે ખરેખર આ URL ને દૂર કરવા માંગો છો?"
 
@@ -18222,15 +19286,75 @@ msgstr ""
 "iCal\n"
 "મુક્ત/વ્યસ્ત"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "કેમ છો પાયથોન"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "પાયથોન પ્લગઇન લોડર ચકાસણીઓ"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "પાયથોન ચકાસણી પ્લગઇન"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "પાયથોન EPlugin લોડર માટે ચકાસણી પ્લગઇન."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "પાયથોન લોડર"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (built-in)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
-msgid "This will make Spamassasin more reliable, but slower"
-msgstr "આ Spamassasin ને વધુ રાહતમય બનાવે છે, પરંતુ થોડું ધીમું"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "SpamAssassin શોધાયુ નહિં, કોડ: %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, c-format
+msgid "Failed to create pipe: %s"
+msgstr "પાઇપ બનાવવા માટે નિષ્ફળતા: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, c-format
+msgid "Error after fork: %s"
+msgstr "ફોર્ક પછી ભૂલ: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr "SpamAssassin ઉપલ્બદ નથી."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr "આ Spamassasin ને વધુ વિશ્ર્વાસપાત્ર બનાવે છે, પરંતુ થોડું ધીમું"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "દૂરસ્થ ચકાસણીઓ સમાવો (_n)"
 
@@ -18256,7 +19380,7 @@ msgstr "સંદેશાના ભાગો અથવા બધા જોડ�
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:330
+#: ../plugins/save-attachments/save-attachments.c:314
 msgid "Save attachments"
 msgstr "જોડાણો સંગ્રહો"
 
@@ -18268,16 +19392,15 @@ msgstr "જોડાણો સંગ્રહો..."
 msgid "Save all attachments"
 msgstr "બધા જોડાણ સંગ્રહો"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "આધાર નામ સંગ્રહો પસંદ કરો"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "MIME પ્રકાર"
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "સંગ્રહો"
 
@@ -18285,79 +19408,79 @@ msgstr "સંગ્રહો"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:167
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "વર્ણન યાદી"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "વર્ગોની યાદી"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "ટિપ્પણી યાદી"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "બનાવાયેલ"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "સંપર્ક યાદી"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "શરુ કરો"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "અંત કરો"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "ટકા પૂર્ણ"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "સભાજનોની યાદી"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "સુધારેલ"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "CSV બંધારણ માટેના અદ્યતન વિકલ્પો"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "હેડર મૂકો"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "કિંમત પૂર્ણ કરનાર:"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "રેકોર્ડ પૂર્ણ કરનાર:"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "ની સાથે કિંમતો સમાવો:"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "અલ્પવિરામથી અલગ પડેલ હોય તેવું બંધારણ (Comma separated value - .csv)"
 
@@ -18378,15 +19501,15 @@ msgstr "ડિસ્કમાં સંગ્રહો (_S)"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:154
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "RDF બંધારણ (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "અંતિમ મુકામ ફાઈલ પસંદ કરો"
 
@@ -18411,12 +19534,12 @@ msgid "Show _only this Task List"
 msgstr "માત્ર આ બાબત યાદી જ બતાવો (_o)"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "પ્લગઈન કે જે શરૂઆતી વિઝાર્ડ નિયંત્રિત કરે છે."
+msgid "Guides you through your initial account setup."
+msgstr ""
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "શરૂઆત વિઝાર્ડ"
+msgid "Setup Assistant"
+msgstr "મદદનીશ સુયોજિત કરો"
 
 #: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
@@ -18443,24 +19566,24 @@ msgid "Importing files"
 msgstr "ફાઈલો આયાત કરી રહ્યા છીએ"
 
 #: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:144
 msgid "Please select the information that you would like to import:"
 msgstr "મહેરબાની કરીને તમે જેની આયાત કરવા માંગો તે જાણકારી પસંદ કરો:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../shell/e-shell-importer.c:397
 #, c-format
 msgid "From %s:"
 msgstr "%s માંથી:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../shell/e-shell-importer.c:508
 #, c-format
 msgid "Importing data."
 msgstr "માહિતી આયાત કરી રહ્યા છીએ."
 
 #: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../shell/e-shell-importer.c:522
 msgid "Please wait"
 msgstr "મહેરબાની કરીને રાહ જુઓ"
 
@@ -18481,6 +19604,29 @@ msgstr "વિષય અનુસાર સંદેશાઓ થ્રેડ �
 msgid "F_all back to threading messages by subject"
 msgstr "વિષય પ્રમાણે સંદેશાઓમાં થ્રેડીંગ કરીને જાવ (_a)"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+#, fuzzy
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr "જોડાણ યાદ અપાવનારર પ્લગઈન માટે સંદેશા ભાગમાં કડીઓની યાદી."
+
+#: ../plugins/templates/templates.c:614
+msgid "No title"
+msgstr "શીર્ષક નથી"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "ટેમ્પ્લેટ તરીકે સંગ્રહ કરો (_T)"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "ટેમ્પ્લેટ તરીકે સંગ્રહ કરો"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "ડ્રાફ્ટો આધારિત ટેમ્પ્લેટ પ્લગઇન"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "સાદું પ્લગઈન કે જે tnef જોડાણોને ડિકોડ કરવા માટે ytnef વાપરે છે."
@@ -18489,6 +19635,28 @@ msgstr "સાદું પ્લગઈન કે જે tnef જોડાણો
 msgid "TNEF Attachment decoder"
 msgstr "TNEF જોડાણ ડિકોડર"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "WebDAV સંપર્કો સુયોજીત કરવા માટેનું પ્લગઈન."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "WebDAV સંપર્કો"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgstr ""
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "ઈવોલ્યુશન શેલ"
@@ -18506,84 +19674,152 @@ msgid "Evolution Test component"
 msgstr "ઈવોલ્યુશન ચકાસણી ભાગ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "વર્તમાન પ્રિન્ટર સુયોજનોનું શબ્દમાળા વર્ણન."
+msgid "Authenticate proxy server connections"
+msgstr "સત્તાઘિકરણ પ્રોક્સી સર્વર જોડાણો"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
+msgid "Automatic proxy configuration URL"
+msgstr "આપોઆપ પ્રોક્સી રૂપરેખાંકન URL"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "રૂપરેખાંકન આવૃત્તિ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Decides whether the crash detection should be run or not."
 msgstr "નક્કી કરે છે કે શું ભંગાણ શોધ ચાલવી જોઈએ કે નહિં."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "આડીપટ્ટીની મૂળભુત પહોળાઈ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "મૂળભુત વિન્ડો ઊંચાઈ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "મૂળભૂત વિન્ડો સ્થિતિ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "મૂળભુત વિન્ડો પહોળાઈ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "HTTP proxy host name"
+msgstr "HTTP પ્રોક્સી યજમાન નામ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy password"
+msgstr "HTTP પ્રોક્સી પાસવર્ડ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy port"
+msgstr "HTTP પ્રોક્સી પોર્ટ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "HTTP proxy username"
+msgstr "HTTP પ્રોક્સી વપરાશકર્તા નામ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "શરુઆતમાં ભાગનું ID અથવા ઉપનામ મૂળભુત રીતે દેખાય છે."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
 msgstr "છેલ્લે સુધારાયેલ રૂપરેખાંકન આવૃત્તિ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "ફોલ્ડરો માટે યાદીના પથો કે જે ઓફલાઈન વપરાશ માટે ડિસ્ક સાથે સુમેળ કરવાના છે"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Non-proxy hosts"
+msgstr "પ્રોક્સી યજમાનો નથી"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Proxy configuration mode"
+msgstr "પ્રોક્સી રૂપરેખાંકન સ્થિતિ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy host name"
+msgstr "SOCKS પ્રોક્સી યજમાન નામ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "SOCKS proxy port"
+msgstr "SOCKS પ્રોક્સી પોર્ટ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy host name"
+msgstr "સુરક્ષિત HTTP પ્રોક્સી યજમાન નામ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Secure HTTP proxy port"
+msgstr "સુરક્ષિત HTTP પ્રોક્સી પોર્ટ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "બાજુપટ્ટી દૃશ્યમાન છે"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "વિકાસ ચેતવણી સંવાદ અવગણો"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
 msgstr "પુનઃપ્રાપ્તિ ચેતવણી સંવાદ અવગણો"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:571
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
 msgid "Start in offline mode"
 msgstr "ઓફલાઈન સ્થિતિમાં શરુ કરો"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "પરિસ્થિતિદર્શક પટ્ટી દૃશ્યમાન છે"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr "ઈવોલ્યુશનની રૂપરેખાંકિત આવૃત્તિ, મુખ્ય/ગૌણ/રૂપરેખાંકન સ્તર સાથે (ઉદાહરણ તરીકે \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default height for the main window, in pixels."
 msgstr "મુખ્ય વિન્ડો માટે મૂળભુત ઊંચાઈ, પિક્સેલોમાં."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "The default width for the main window, in pixels."
 msgstr "મુખ્ય વિન્ડો માટે મૂળભુત પહોળાઈ, પિક્સેલોમાં."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "બાજુની પટ્ટી માટે મૂળભુત પહોળાઈ, પિક્સેલોમાં."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -18591,7 +19827,37 @@ msgstr ""
 "ઈવોલ્યુશનની છેલ્લી સુધારાયેલ રૂપરેખાંકિત આવૃત્તિ, મુખ્ય/ગૌણ/ રૂપરેખાંકન સ્તરો સાથે (ઉદાહરણ "
 "તરીકે \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The machine name to proxy HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The machine name to proxy secure HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+msgid "The machine name to proxy socks through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -18601,51 +19867,71 @@ msgstr ""
 "\"સાધનપટ્ટી\" સુયોજિત હોય, તો જીનોમ સાધનપટ્ટી સુયોજનો દ્વારા બટનોની શૈલી નક્કી થાય "
 "છે."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "સાધનપટ્ટી દૃશ્યમાન છે"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "URL that provides proxy configuration values."
+msgstr "URL કે જે પ્રોક્સી રૂપરેખાંકન કિંમતો પૂરી પાડે છે."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+msgid "Use HTTP proxy"
+msgstr "HTTP પ્રોક્સી વાપરો"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "શું ઈવોલ્યશન ઓનલાઈન સ્થિતિની જગ્યાઓ ઓફલાઈન સ્થિતિમાં શરૂ થશે."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether crash detection should be done or not"
 msgstr "શું ભંગાણ શોધ થવી જોઈએ કે નહિં"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether or not the window should be maximized."
 msgstr "વિન્ડો મોટી થવી જોઈએ કે નહિં."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "શું બાજુપટ્ટી દૃશ્યમાન હોવી જોઈએ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the status bar should be visible."
 msgstr "શું પરિસ્થિતિદર્શક પટ્ટી દૃશ્યમાન હોવી જોઈએ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
 msgstr "શું સાધનપટ્ટી દૃશ્યમાન થશે."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "શું ઈવોલ્યુશનની વિકાસ આવૃત્તિઓમાંનો ચેતવણી સંવાદ અવગણાયેલ છે."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in recovery of Evolution is skipped."
 msgstr "શું ઈવોલ્યુશનની પુનઃપ્રાપ્તિમાં ચેતવણી સંવાદ અવગણવામાં આવવો જોઈએ કે નહિં."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "શું વિન્ડો બટનો દેખાવા જોઈએ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "વિન્ડો બટન શૈલી"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "વિન્ડો બટનો દૃશ્યમાન છે"
 
@@ -18661,11 +19947,11 @@ msgstr "સક્રિય જોડાણો"
 msgid "Click OK to close these connections and go offline"
 msgstr "આ જોડાણો બંધ કરવા માટે બરાબર પર ક્લિક કરો અને ઓફલાઈન થાઓ"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:132
 msgid "Choose the type of importer to run:"
 msgstr "ચલાવવા માટે આયાત કરનારનો પ્રકાર પસંદ કરો:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -18679,11 +19965,11 @@ msgstr ""
 "જો તમે જાણતા ના હોય તો તમે \"આપોઆપ\" પસંદ કરી શકો છો, અને ઈવોલ્યુશન તેને કામ કરવા "
 "માટે લઈ લેશે."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid "Choose the destination for this import"
 msgstr "આ આયાત માટે અંતિમ મુકામ પસંદ કરો"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:147
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -18695,146 +19981,134 @@ msgstr ""
 "સુયોજનો મળ્યા નથી. જો તમે ફરીથી પ્રયત્ન કરવા\n"
 "માંગતા હોય, તો મહેરબાની કરીને \"પાછળ\" બટન ક્લિક કરો.\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "ફાઈલનું નામ (_i):"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "ફાઈલ પસંદ કરો"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:299
 msgid "File _type:"
 msgstr "ફાઈલનો પ્રકાર (_t):"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:335
 msgid "Import data and settings from _older programs"
 msgstr "જૂના કાર્યક્રમોમાંથી માહિતી અને સુયોજનો આયાત કરો (_o)"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:338
 msgid "Import a _single file"
 msgstr "એક ફાઈલ જ આયાત કરો (_s)"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-settings-dialog.c:314
 msgid "Evolution Preferences"
 msgstr "ઈવોલ્યુશન પસંદગીઓ"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "કોઈ ફોલ્ડર નામ સ્પષ્ટ કરેલ નથી."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "ફોલ્ડર નામ રીટર્ન અક્ષર ધરાવતું નથી."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "ફોલ્ડર નામ \"/\" અક્ષર ધરાવતું નથી."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "ફોલ્ડર નામ \"#\" અક્ષર ધરાવતું નથી."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' અને '..' એ ફોલ્ડર નામો માટે આરક્ષિત છે."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - ઈવોલ્યુશન"
 
-#: ../shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "જીનોમ પાયલોટ સાધનો આ સિસ્ટમ પર સ્થાપિત થયા હોય એમ લાગતું નથી."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "%s ચલાવવામાં ભૂલ."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "બગ બડી સ્થાપિત નથી."
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "બગ બડ્ડી ચલાવી શકાયું નહિં."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:663
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr "અંકિત પટેલ <ankit644@yahoo.com>"
 
-#: ../shell/e-shell-window-commands.c:674
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "ઈવોલ્યુશન વેબસાઈટ"
 
-#: ../shell/e-shell-window-commands.c:692
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "FAQ વેબપાનું ખોલવામાં ભૂલ."
 
-#: ../shell/e-shell-window-commands.c:889
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "ઓનલાઈન કામ કરો (_W)"
 
-#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "ઓફલાઈન કામ કરો (_W)"
 
-#: ../shell/e-shell-window-commands.c:915
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "ઓફલાઈન કામ કરો"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "ઈવોલ્યુશન વર્તમાનમાં ઓનલાઈન છે. ઓફલાઈન કામ કરવા માટે આ બટન પર ક્લિક કરો."
+#: ../shell/e-shell-window.c:377
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
+msgstr ""
+"ઈવોલ્યુશન વર્તમાનમાં ઓનલાઈન છે.\n"
+"ઓફલાઈન કામ કરવા માટે આ બટન પર ક્લિક કરો."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "ઈવોલ્યુશન પ્રક્રિયાને ઓફલાઈન કામ કરવાની પ્રક્રિયામાં છે."
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "ઈવોલ્યુશન વર્તમાનમાં ઓફલાઈન છે. ઓનલાઈન કામ કરવા માટે આ બટન પર ક્લિક કરો."
+#: ../shell/e-shell-window.c:391
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+msgstr ""
+"ઈવોલ્યુશન વર્તમાનમાં ઓફલાઈન છે.\n"
+"ઓનલાઈન કામ કરવા માટે આ બટન પર ક્લિક કરો."
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:780
 #, c-format
 msgid "Switch to %s"
 msgstr "%s માં બદલો"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:638
 msgid "Unknown system error."
 msgstr "અજ્ઞાત સિસ્ટમ ભૂલ."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "બરાબર"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1280
 msgid "Invalid arguments"
 msgstr "અયોગ્ય દલીલો"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1282
 msgid "Cannot register on OAF"
 msgstr "OAF પર નોંધ કરાવી શકતા નથી"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1284
 msgid "Configuration Database not found"
 msgstr "રુપરેખાંકન ડેટાબેઝ મળ્યો નથી"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "નવું"
 
@@ -18843,6 +20117,7 @@ msgid "New Test"
 msgstr "નવી ચકાસણી"
 
 #: ../shell/test/evolution-test-component.c:108
+msgctxt "New"
 msgid "_Test"
 msgstr "ચકાસણી (_T)"
 
@@ -18889,7 +20164,7 @@ msgstr ""
 "કેવી રીતે આયાત કરવી તે પ્રક્રિયાનું માર્ગદર્શન આપવામાં આવેલ છે."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:228
+#: ../shell/main.c:222
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18924,7 +20199,7 @@ msgstr ""
 "અમે એવી આશા રાખીએ છીએ કે તમે અમારી સખ્ત મહેનતના પરિણામને માણી રહ્યા હશો,\n"
 "અને અમે તમારા ફાળાની આતુરતાથી રાહ જોઈ રહ્યા છીએ!\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18932,19 +20207,19 @@ msgstr ""
 "આભાર\n"
 "ઈવોલ્યુશન ટુકડી\n"
 
-#: ../shell/main.c:259
+#: ../shell/main.c:253
 msgid "Do not tell me again"
 msgstr "મને ફરી વાર કહો નહિં"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:303
 msgid "Evolution Crash Detection"
 msgstr "ઈવોલ્યુશન ભંગાણ શોધ"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:305
 msgid "Ig_nore"
 msgstr "અવગણો (_n)"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:320
 #, no-c-format
 msgid ""
 "Evolution appears to have exited unexpectedly the last time it was\n"
@@ -18955,43 +20230,43 @@ msgstr ""
 "ત્યારે.  પૂર્વસાવધાની માપન તરીકે, બધી પૂર્વદર્શન તકતીઓ છુપાયેલ હશે.\n"
 "તમે દેખાવ મેનુમાંથી પૂર્વદર્શન તકતીઓ પુનઃસંગ્રહી શકો છો.\n"
 
-#: ../shell/main.c:337
+#: ../shell/main.c:331
 msgid "_Do not show this message again"
 msgstr "આ સંદેશો ફરીથી બતાવશો નહિં (_D)"
 
-#: ../shell/main.c:569
+#: ../shell/main.c:563
 msgid "Start Evolution activating the specified component"
 msgstr "સ્પષ્ટ કરેલ કમ્પોનન્ટ ક્રિયાશીલ કરવા માટે ઈવોલ્યુશન શરુ કરો"
 
-#: ../shell/main.c:573
+#: ../shell/main.c:567
 msgid "Start in online mode"
 msgstr "ઓનલાઈન સ્થિતિમાં શરુ કરો"
 
-#: ../shell/main.c:576
+#: ../shell/main.c:570
 msgid "Forcibly shut down all Evolution components"
 msgstr "ઈવોલ્યુશનના બધા કમ્પોનન્ટો દબાણપૂર્વક બંધ કરી દો"
 
-#: ../shell/main.c:580
+#: ../shell/main.c:574
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "ઈવોલ્યુશન ૧.૪ માંથી દબાણપૂર્વક ફેરવો"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:577
 msgid "Send the debugging output of all components to a file."
 msgstr "ફાઈલના બધા કમ્પોનન્ટો માટે ભૂલ શોધવા માટેનું આઉટપુટ મોકલો."
 
-#: ../shell/main.c:585
+#: ../shell/main.c:579
 msgid "Disable loading of any plugins."
 msgstr "કોઈપણ પ્લગઈનો લાવવાનું નિષ્ક્રિય કરો."
 
-#: ../shell/main.c:587
+#: ../shell/main.c:581
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "મેઈલ, સંપર્કો અને ક્રિયાઓની પૂર્વદર્શન તકતી નિષ્ક્રિય કરો."
 
-#: ../shell/main.c:617
+#: ../shell/main.c:666
 msgid "- The Evolution PIM and Email Client"
 msgstr "- ઈવોલ્યુશન PIM અને ઈમેઈલ ક્લાઈન્ટ"
 
-#: ../shell/main.c:630
+#: ../shell/main.c:694
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19132,7 +20407,7 @@ msgstr ""
 "જો તમે ચાલુ રાખવાનું પસંદ કરો, તો તમને તમારી જૂની માહિતીના અમુક ભાગોને ચલાવવાની "
 "પરવાનગી નથી.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19143,7 +20418,7 @@ msgstr ""
 "\n"
 "વિશ્વાસુ સુયોજનોમાં ફેરફાર કરો:"
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:151
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -19152,7 +20427,7 @@ msgstr ""
 "તમે પ્રમાણપત્રના સ્તાધિકાર કે જે તમને પ્રમાણપત્ર અદા કરે તેનો વિશ્વાસ કરો એટેલે, ત્યાર પછી "
 "તમે આ પ્રમાણપત્રની સત્તાધિકર પર વિશ્વાસ કરો જ્યાં સુધી તે સૂચવાયેલ નહિં હોય"
 
-#: ../smime/gui/cert-trust-dialog.c:158
+#: ../smime/gui/cert-trust-dialog.c:155
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -19209,11 +20484,16 @@ msgstr "ઈ-મેઈલ સરનામુ"
 msgid "All CA certificate files"
 msgstr "બધી CA પ્રમાણપત્ર ફાઈલો"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:339
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "પ્રમાણપત્ર દર્શક: %s"
 
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "`%s' માટે પાસવર્ડ દાખલ કરો"
+
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -19224,7 +20504,7 @@ msgid "Enter new password"
 msgstr "નવો પાસવર્ડ દાખલ કરો"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:115
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19233,7 +20513,7 @@ msgstr ""
 "ને અદા થયેલ છે:\n"
 "  વિષય: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19242,7 +20522,7 @@ msgstr ""
 "દ્વારા અદા થયેલ:\n"
 "  વિષય: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:168
 msgid "Select certificate"
 msgstr "પ્રમાણપત્ર પસંદ કરો"
 
@@ -19427,7 +20707,7 @@ msgid "_Edit CA Trust"
 msgstr "CA વિશ્વાસમાં ફેરફાર કરો (_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:679
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "પ્રમાણપત્ર પહેલાથી જ હાજર છે"
 
@@ -19635,8 +20915,7 @@ msgstr "બધા સંપર્કોની નકલ અંહિ કરો (
 msgid "Contact _Preview"
 msgstr "સંપર્ક પૂર્વદર્શન (_P)"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "નકલ કરો"
@@ -19661,8 +20940,7 @@ msgstr "આ ફોલ્ડરમાં નકલ કરો..."
 msgid "Create a new addressbook folder"
 msgstr "નવું સરનામા પુસ્તિકા ફોલ્ડર બનાવો"
 
-#: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "કાપો"
@@ -19703,8 +20981,7 @@ msgstr "પસંદિત ફોલ્ડરના સંપર્કોને
 msgid "Move to Folder..."
 msgstr "ફોલ્ડરમાં ખસેડો..."
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "ચોંટાડો"
@@ -19741,13 +21018,11 @@ msgstr "પસંદ કરેલ સંપર્કોને VCard તરીક
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "પસંદ કરેલ ફોલ્ડરના સંપર્કોને VCard તરીકે સંગ્રહો"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "બધું પસંદ કરો"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "બધું પસંદ કરો (_A)"
 
@@ -19816,7 +21091,7 @@ msgstr "સંપર્કોને આમાં ખસેડો (_M)..."
 msgid "_Move Folder Contacts To"
 msgstr "ફોલ્ડર સંપર્કોને આમાં ખસેડો (_M)"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "નવું (_N)"
 
@@ -19877,7 +21152,7 @@ msgid "Month"
 msgstr "મહિનો"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "આગળ વધો"
 
@@ -19886,7 +21161,7 @@ msgid "Previews the calendar to be printed"
 msgstr "કેલેન્ડરનું છાપન માટે પૂર્વદર્શન આપે છે"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "પહેલાનું"
 
@@ -19954,232 +21229,6 @@ msgstr "કામ કરવાનું અઠવાડિયુ"
 msgid "_Open Appointment"
 msgstr "મુલાકાત ખોલો (_O)"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "પસંદ કરેલ લખાણને ક્લિપબોર્ડમાં નકલ કરો"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "પસંદગીને ક્લિપબોર્ડમાં નકલ કરો"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "પસંદ કરેલ લખાણને ક્લિપબોર્ડમાં કાપો"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "પસંદગીને ક્લિપબોર્ડમાં કાપો"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "ક્લિપબોર્ડમાંથી ચોંટાડો"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "ક્લિપબોર્ડમાંથી લખાણ ચોંટાડો"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "બધું લખાણ પસંદ કરો"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "જોડો"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "ફાઈલો જોડવા માટે અંહિ ક્લિક કરો"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "વર્તમાન વિન્ડો ખોલવા માટે અંહિ ક્લિક કરો"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "વર્તમાન વિન્ડો સંગ્રહવા માટે અંહિ ક્લિક કરો"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "ઉપલબ્ધ મદદ જોવા માટે અંહિ ક્લિક કરો"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "બંધ કરો"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "દાખલ કરો (_n)"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "જોડાણ (_A)..."
-
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "બંધ કરો (_C)"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:53
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "ફાઈલ (_F)"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "મદદ (_H)"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "વિકલ્પો (_O)"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "બધા દિવસની ઘટના"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "બધા દિવસની ઘટના (_D)"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "વિશ્વાસજનક તરીકે વર્ગીકૃત કરો"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "ખાનગી તરીકે વર્ગીકૃત કરો"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "જાહેર તરીકે વર્ગીકૃત કરો"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "આ ઘટના માટે એલાર્મો સુયોજિત અથવા અસુયોજિત કરવા માટે અંહિ ક્લિક કરો"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "અદ્યતન મોકલો વિકલ્પો દાખલ કરો"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "આને રીકરીંગ ઘટના બનાવો"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "જાહેર (_b)"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "સભાજનો માટે મુક્ત / વ્યસ્ત જાણકારીનો પ્રશ્ન પૂછો"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "ભૂમિકા ક્ષેત્ર (_o)"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "મોકલો વિકલ્પો (_O)"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "સમયને વ્યસ્ત બતાવો (_b)"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "ટાઈમ ઝોન (_Z)"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "શું સભાજન પ્રકાર ક્ષેત્ર દર્શાવાયેલ છે તે બદલે છે"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "શું RSVP ક્ષેત્ર દર્શાવાયેલ છે તે બદલે છે"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "શું ભૂમિકા ક્ષેત્ર દર્શાવાયેલ છે તે બદલે છે"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "શું પરિસ્થિતિ ક્ષેત્ર દર્શાવાયેલ છે તે બદલે છે"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "શું ટાઈમ ઝોન દર્શાવાયેલ છે તે બદલે છે"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "શું વર્ગો દર્શાવવા તે બદલે છે"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "શું બધા દિવસની ઘટના હોવી જોઈએ તે બદલે છે"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "શું સમયને વ્યસ્ત તરીકે બતાવો તે બદલે છે"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "એલાર્મ (_A)"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "વર્ગો (_C)"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "વર્ગીકરણ (_C)"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "વિશ્વાસજનક (_C)"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "મુક્ત/વ્યસ્ત (_F)"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "ખાનગી (_P)"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "વળતર (_R)"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "પરિસ્થિતિ ક્ષેત્ર (_S)"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "પ્રકાર ક્ષેત્ર (_T)"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "વર્તમાન મેઈલ પ્રક્રિયા રદ કરો"
@@ -20209,7 +21258,6 @@ msgid "Empty _Trash"
 msgstr "કચરાપેટી ખાલી કરો (_T)"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "ફોલ્ડર (_o)"
 
@@ -20881,9 +21929,9 @@ msgstr "નાનું મોટું (_Z)"
 msgid "_Zoom In"
 msgstr "મોટું કરો (_Z)"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "આ વિન્ડો બંધ કરો"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "બંધ કરો"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -20921,290 +21969,6 @@ msgstr "પસંદ કરેલ મેમો જુઓ"
 msgid "_Open Memo"
 msgstr "મેમો ખોલો (_O)"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "ફાઈલ જોડો"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "વર્તમાન ફાઈલ બંધ કરો"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "બધી સહીઓ કાઢી નાંખો"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "આ સંદેશાને PGP સાથે એનક્રિપ્ટ કરો"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "તમારા S/MIME એનક્રિપ્શન પ્રમાણપત્ર સાથે આ સંદેશો એનક્રિપ્ટ કરો"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "બંધારણ ઘડો (_m)"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "જ્યારે તમારો સંદેશો વંચાય ત્યારે પહોંચ સૂચન મેળવો"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "મોકલો વિકલ્પો દાખલ કરો"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "ફાઈલ ખોલો"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "PGP એનક્રિપ્ટ"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "PGP સહી"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "PGP એનક્રિપ્ટ (_E)"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "PGP સહી (_S)"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "વાંચન રસીદની અરજી કરો (_e)"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "S/MIME એનક્રિપ્ટ (_c)"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "S/MIME એનક્રિપ્ટ"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "S/MIME સહી (_n)"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "S/MIME સહી"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "મોકલો (_e)"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "આ રીતે સંગ્રહો"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "ડ્રાફ્ટ સંગ્રહો"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "આ રીતે સંગ્રહો (_A)..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "ડ્રાફ્ટ સંગ્રહો (_D)"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "ડ્રાફ્ટ તરીકે સંગ્રહો"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "ફોલ્ડરમાં સંગ્રહો..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "વર્તમાન ફાઈલ સંગ્રહો"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "વર્તમાન ફાઈલ અલગ નામથી સંગ્રહો"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "સ્પષ્ટ કરેલ ફોલ્ડરમાં સંદેશાને સંગ્રહો"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "મોકલો"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "મેઈલને HTML બંધારણમાં મોકલો"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "આ સંંદેશાને મોકલો"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "સંદેશા પ્રાધાન્યને ઊંચી સુયોજિત કરો"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "આ સંદેશાને તમારી PGP કી સાથે સહી કરો"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "આ સંદેશાને તમારી S/MIME સહી પ્રમાણપત્ર સાથે સહી કરો"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "આને પણ ખબર વિના ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "આને પણ ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "શું તરફથી પસંદ કરનાર પ્રદર્શિત છે તે ફેરબદલી કરો"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "શું ને પોસ્ટ કરો ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "શું ને વળતો જવાબ આપો ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "શું પ્રતિ ક્ષેત્ર પ્રદર્શિત છે કે નહિં તે ફેરબદલી કરો"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "આને પણ ખબર વિના ક્ષેત્ર (_B)"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "આને પણ ક્ષેત્ર (_C)"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "બધું કાઢી નાંખો (_D)"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "તરફથી ક્ષેત્ર (_F)"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "ખોલો (_O)..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "ને પોસ્ટ કરો ક્ષેત્ર (_P)"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "સંદેશાનું પ્રાધાન્યકરણ કરો (_P)"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "ને વળતો જવાબ આપો ક્ષેત્ર (_R)"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "સુરક્ષા (_S)"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "મોકલોના વિકલ્પો (_S)"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "પ્રતિ ક્ષેત્ર (_T)"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "બંધ કરો (_l)"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "સંગ્રહો અને બંધ કરો"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "સંગ્રહો અને બંધ કરો (_C)"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "વર્તમાન ફાઈલ સંગ્રહો અને વિન્ડો બંધ કરો"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "તમારા ઉમેદવારી ફોલ્ડોરોની યાદીમાં ફોલ્ડર ઉમેરો"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "યાદી ફરીથી તાજી કરો"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "ફોલ્ડરોની યાદી ફરીથી તાજી કરો"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "તમારા ઉમેદવારી ફોલ્ડરોની યાદીમાંથી ફોલ્ડર દૂર કરો"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "ઉમેદવારી કરો"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "ઉમેદવારી દૂર કરો"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "પસંદગી ઊંધી કરો (_I)"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "ક્રિયાની પરિસ્થિતિ વિગતો માટે બદલો / જુઓ ક્લિક કરો"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "પરિસ્થિતિ વિગતો"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "ટાઈમ ઝોન"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "પરિસ્થિતિ વિગતો (_S)"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "પસંદિત બાબતોની નકલ કરો"
@@ -21398,50 +22162,54 @@ msgid "View/Hide the Status Bar"
 msgstr "પરિસ્થિતિદર્શક પટ્ટી જુઓ/છુપાવો"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "ઓફલાઈન કામ કરો (_O)"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "વિશે (_A)"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "વિન્ડો બંધ કરો (_C)"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "પાસવર્ડો ભૂલી ગયા (_F)"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "વારંવાર પૂછવામાં આવતા પ્રશ્નો (_F)"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "બટનો છુપાવો (_H)"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "માત્ર ચિહ્નો (_I)"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "ઝડપી સંદર્ભ (_Q)"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "બહાર નીકળો (_Q)"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "સ્વીચરનો દેખાવ (_S)"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "સુમેળ વિકલ્પો (_S)..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "માત્ર લખાણ (_T)"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "વિન્ડો (_W)"
 
@@ -21518,11 +22286,11 @@ msgid "With _Status"
 msgstr "સ્થિતિ સહિત (_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
 msgid "UTC"
 msgstr "UTC"
 
@@ -21539,8 +22307,8 @@ msgid "Select a Time Zone"
 msgstr "ટાઈમ ઝોન પસંદ કરો"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "ટાઈમઝોન કમ્બોબોક્સ"
+msgid "Timezone drop-down combination box"
+msgstr ""
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -21552,19 +22320,19 @@ msgstr ""
 "કરો.\n"
 "તેને નાનું કરવા માટે જમણું માઉસ બટન વાપરો."
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr "સંગ્રહ"
 
-#: ../widgets/menus/gal-define-views-dialog.c:360
+#: ../widgets/menus/gal-define-views-dialog.c:358
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "%s માટે દેખાવો વ્યાખ્યાયિત કરો"
 
+#: ../widgets/menus/gal-define-views-dialog.c:366
 #: ../widgets/menus/gal-define-views-dialog.c:368
-#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "દેખાવો વ્યાખ્યાયિત કરો"
 
@@ -21574,17 +22342,17 @@ msgid "Define Views for \"%s\""
 msgstr "\"%s\" માટે દેખાવો વ્યાખ્યાયિત કરો"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../widgets/table/e-table-scrolled.c:216
 #: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "કોષ્ટક"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "પળ"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "વર્તમાન દેખાવ સંગ્રહો"
 
@@ -21636,11 +22404,11 @@ msgstr "વર્તમાન વૈવિધ્યપૂર્ણ દેખા�
 msgid "Create or edit views"
 msgstr "દેખાવો બનાવો અથવા ફેરફાર કરો"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "કારખાનું"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "નવો દેખાવ વ્યાખ્યાયિત કરો"
 
@@ -21656,17 +22424,17 @@ msgstr "દેખાવનો પ્રકાર"
 msgid "Type of view:"
 msgstr "દેખાવનો પ્રકાર:"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "જોડાણ પટ્ટી"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "ફાઈલ %s જોડી શકતા નથી: %s"
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "ફાઈલ %s જોડી શકતા નથી: નિયમિત ફાઈલ નથી"
@@ -21688,33 +22456,32 @@ msgid "Suggest automatic display of attachment"
 msgstr "જોડાણનું આપોઆપ પ્રદર્શન સૂચવો"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1726
+#: ../widgets/misc/e-calendar-item.c:1273
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "મહિના કેલેન્ડર"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "રંગ ભરો"
 
 #: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
+#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
+#: ../widgets/text/e-text.c:3659
 msgid "GDK fill color"
 msgstr "GDK ભરવાનો રંગ"
 
 #: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "સ્ટીપલ ભરો"
 
@@ -21739,29 +22506,29 @@ msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "ન્યુનતમ પહોળાઈ"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "ન્યુનતમ પહોળાઈ"
 
 #: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "જગ્યા છોડી રહ્યા છીએ"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:291
 msgid "Now"
 msgstr "હમણાં"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:848
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "સમય બંધારણમાં જ હોવો જોઈએ: %s"
@@ -21770,152 +22537,151 @@ msgstr "સમય બંધારણમાં જ હોવો જોઈએ: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ટકા ૦ અને ૧૦૦ ની વચ્ચે જ હોવા જોઈએ"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Arabic"
 msgstr "અરેબી"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Baltic"
 msgstr "બાલ્ટિક"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Central European"
 msgstr "કેન્દ્રીય યુરોપિયાઈ"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Chinese"
 msgstr "ચીની"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Cyrillic"
 msgstr "સિરિલ્લિક"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Greek"
 msgstr "ગ્રીક"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Hebrew"
 msgstr "હિબ્રુ"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "જાપાની"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "કોરિયાઈ"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Thai"
 msgstr "થાઈ"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
 msgstr "તુર્કી"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
 msgstr "યુનિકોડ"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Western European"
 msgstr "પશ્ચિમિ યુરોપિયાઈ"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European, New"
 msgstr "પશ્ચિમિ યુરોપિયાઈ, નવું"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
 msgid "Traditional"
 msgstr "સાંસ્કૃતિક"
 
-#: ../widgets/misc/e-charset-picker.c:100
-#: ../widgets/misc/e-charset-picker.c:101
-#: ../widgets/misc/e-charset-picker.c:102
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
 msgstr "સરળ"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:97
 msgid "Ukrainian"
 msgstr "યુક્રેનિયાઈ"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Visual"
 msgstr "દેખીતું"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:169
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "અક્ષરનો અજ્ઞાત સમૂહ: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:214
 msgid "Character Encoding"
 msgstr "અક્ષરોની સંગ્રહપદ્ધતિ"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:229
 msgid "Enter the character set to use"
 msgstr "અક્ષરોનો સમૂહ વાપરવા માટે દાખલ કરો"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:336
 msgid "Other..."
 msgstr "અન્ય..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:598
 msgid "Ch_aracter Encoding"
 msgstr "અક્ષરોની સંગ્રહપદ્ધતિ (_a)"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "તારીખ અને સમય"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "તારીખ દાખલ કરવા માટે લખાણ પ્રવેશ"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "કેલેન્ડર બતાવવા માટે આ બટન પર ક્લિક કરો"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:394
+#, fuzzy
+msgid "Drop-down combination box to select time"
 msgstr "સમય પસંદ કરવા માટે કમ્બો બોક્સ"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "હમણાં (_w)"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "આજે (_T)"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "અયોગ્ય તારીખ મૂલ્ય"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "અયોગ્ય સમય મૂલ્ય"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "વિસ્તૃત થયેલ"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "શું વિસ્તારનાર વિસ્તૃત થશે કે નહિં"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "વિસ્તારનારના લેબલનું લખાણ"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "નીચે લીટી વાપરો"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -21923,37 +22689,37 @@ msgstr ""
 "જો સુયોજિત હોય, તો લખાણમાં નીચે લીટી પછીનો અક્ષર મ્નેમોનિક એસીલરેટર કી માટે વપરાય છે "
 "એમ સૂચવે છે"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "લેબલ અને બાળક વચ્ચે મૂકવાની જગ્યા"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "લેબલ વિજેટ"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "રોજિંદા વિસ્તૃતકારક લેબલ ની જગ્યાએ વિજેટ બતાવો"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
 msgid "Expander Size"
 msgstr "વિસ્તારનારનું માપ"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
 msgid "Size of the expander arrow"
 msgstr "વિસ્તારનાર તીરનું માપ"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "સૂચકની વચ્ચેની જગ્યા"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "વિસ્તારનાર તીરની ફરતે જગ્યા છોડી રહ્યા છીએ"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
-#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:748
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
 msgid "Advanced Search"
 msgstr "ઉન્નત શોધ"
 
@@ -21998,22 +22764,31 @@ msgstr "વર્તમાન ફોલ્ડર"
 msgid "Current Message"
 msgstr "વર્તમાન સંદેશો"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:167
 msgid "Choose Image"
 msgstr "ઈમેજ પસંદ કરો"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:625
 msgid "World Map"
 msgstr "દુનિયા નક્શો"
 
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:627
+#, fuzzy
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
+"should instead select the timezone from the drop-down combination box below."
 msgstr ""
 "ટાઈમઝોન પસંદ કરવા માટે માઉસ-આધારિત પૂછપરછ નક્શા વિજેટ. કીબોર્ડ વપરાશકર્તાઓએ તેની "
 "જગ્યાએ નીચેના કમ્બોબોક્સમાંથી ટાઈમઝોન પસંદ કરવો જોઈએ."
 
+#: ../widgets/misc/e-online-button.c:112
+msgid "Online"
+msgstr "ઓનલાઇન"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr "બટન સ્થિતિ ઓનલાઇન છે"
+
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "ની સાથે સુમેળ કરો:"
@@ -22038,61 +22813,61 @@ msgstr "મોડેલ ફરી ભરો"
 msgid "Column width"
 msgstr "સ્તંભ પહોળાઈ"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "શોધ"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "શોધ પ્રકાર બદલવા માટે અંહિ ક્લિક કરો"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "શોધ (_S)"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "હમણાં શોધો (_F)"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "સાફ કરો (_C)"
 
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "વસ્તુ ID"
 
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "લખાણ"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1013
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "બતાવો (_w): "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1030
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "શોધો (_c): "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1042
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " અંદર (_n) "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "કર્સર હરોળ"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "કર્સર સ્તંભ"
@@ -22109,7 +22884,7 @@ msgstr "પસંદગી પદ્ધતિ"
 msgid "Cursor Mode"
 msgstr "કર્સરની સ્થિતિ"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:518
 msgid "When de_leted:"
 msgstr "જ્યારે કાઢી નંખાય (_l):"
 
@@ -22133,10 +22908,6 @@ msgstr "<b>સ્થિતિ પકડવાનું</b>"
 msgid "A_uto-delete sent item"
 msgstr "મોકલાયેલ વસ્તુઓને આપોઆપ કાઢી નાંખો (_u)"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "વર્ગીકરણ"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "જાણકારી મેળવવા માટે મોકલાયેલ વસ્તુ બનાવો (_e)"
@@ -22217,39 +22988,40 @@ msgstr "પછી (_A):"
 msgid "_All information"
 msgstr "બધી જાણકારી (_A)"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#. To translators: This means Delay the message delivery for some time
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
 msgstr "સંદેશો પહોંચવામાં વિલંબ (_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "પહોંચી ગયો (_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "સમયસમાપ્તિ તારીખ સુયોજિત કરો (_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "જ્યાં સુધી નહિં (_U):"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "જ્યારે યોગ્ય લાગે (_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "જ્યારે ખૂલે (_W):"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:303
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% પૂર્ણ થયું)"
@@ -22294,23 +23066,23 @@ msgstr "પ્રકાશિત કરેલ સ્તંભ"
 msgid "Unselected Column"
 msgstr "પસંદ નહિં કરેલ સ્તંભ"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "સ્તંંભ ચેકી નાખો"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "નીચે લીટી કરેલ સ્તંભ"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "ઘાટો સ્તંભ"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "રંગીન સ્તંભ"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "BG રંગવાળો સ્તંભ"
 
@@ -22348,7 +23120,7 @@ msgid "A_vailable Fields:"
 msgstr "ઉપલબ્ધ ક્ષેત્રો (_v):"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "ચઢતો ક્રમ"
 
@@ -22361,7 +23133,7 @@ msgid "Clear _All"
 msgstr "બધું સાફ કરો (_A)"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "ઊતરતો ક્રમ"
 
@@ -22424,14 +23196,14 @@ msgstr "ક્રમમાં ગોઠવો (_S)..."
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
 #: ../widgets/table/e-table-field-chooser-item.c:634
 #: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1886
+#: ../widgets/table/e-table-header-item.c:1887
 msgid "DnD code"
 msgstr "DnD કોડ"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
 #: ../widgets/table/e-table-field-chooser-item.c:641
 #: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "સંપૂર્ણ હેડર"
 
@@ -22465,290 +23237,290 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d વસ્તુ)"
 msgstr[1] "%s (%d વસ્તુઓ)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "હરોળના રંગોની અદલાબદલી કરી રહ્યા છીએ"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "આડી દોરવાની જાળી"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "ઊભી દોરવાની જાળી"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "દોરવાનું ફોકસ"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "કર્સરની સ્થિતિ"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "પસંદગી મોડેલ"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "લંબાઈ થ્રેશોલ્ડ"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "હરોળની અનન્ય ઊંચાઈ"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "ઠંડુ થયેલ"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "વર્તમાન દેખાવ બદલો"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "ચઢતા ક્રમમાં ગોઠવો (_A)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "ઊતરતા ક્રમમાં ગોઠવો (_D)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "ક્રમમાં ગોઠવો નહિં (_U)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "આ ક્ષેત્ર દ્વારા જૂથ પાડો (_F)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "બોક્સ દ્વારા જૂથ (_B)"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "આ સ્તંભ કાઢી નાખો (_C)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "સ્તંભ ઉમેરો (_o)..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "ગોઠવણી (_l)"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "શ્રેષ્ઠ રીતે બંધબેસતું (_e)"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "સ્તંભોનું બંધારણ ઘડો (_s)..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "વર્તમાન દેખાવ બદલો (_m)..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "આના પ્રમાણે ક્રમમાં ગોઠવો (_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "વૈવિધ્યપૂર્ણ (_C)"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "ફોન્ટ વર્ણન"
 
-#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-header-item.c:1915
 #: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "ક્રમમાં ગોઠવવાની જાણકારી"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "ટ્રી"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "કોષ્ટક હેડર"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "કોષ્ટક મોડેલ"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "કર્સર હરોળ"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-tree.c:3356
 msgid "Always search"
 msgstr "હંમેશ શોધ"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "ઉમેરવા માટે ક્લિક વાપરો"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
 msgid "ETree table adapter"
 msgstr "ETree કોષ્ટક એડપ્ટર"
 
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3362
 msgid "Retro Look"
 msgstr "રેટ્રો દેખાવ"
 
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3363
 msgid "Draw lines and +/- expanders."
 msgstr "લીટીઓ દોરો અને +/- વિસ્તૃત કરો."
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "ઈનપુટ પદ્ધતિઓ"
 
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "ઘટના પ્રોસેસર"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "ઘાટુ"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "ચેકી નાખવાનું"
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "એન્કર"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "ન્યાય"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "ક્લિપ પહોળાઈ"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "ક્લિપ ઊંચાઈ"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "ક્લિપ"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "ક્લિપ લંબચોરસ ભરો"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "X ઓફસેટ"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Y ઓફસેટ"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "લખાણની પહોળાઈ"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "લખાણની ઊંચાઈ"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "લંબગોળો વાપરો"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "લંબગોળો"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "લીટી લપેટો"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "અક્ષરો તોડો"
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "મહત્તમ લીટીઓ"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "કિનારીઓ દોરો"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "નવી લીટીઓને પરવાનગી આપો"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "પાશ્વ ભાગ દોરો"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "બટન દોરો"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "કર્સરની સ્થિતિ"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "IM સંદર્ભ"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "દૃશ્યપોપ-અપ નિયંત્રિત કરો"
 
diff --git a/po/ko.po b/po/ko.po
index efb3451687..baf4c68730 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,12 +6,13 @@
 # Changwoo Ryu <cwryu@debian.org>, 2003-2006, 2007, 2008.
 #
 #
+#: ../shell/main.c:683
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-03 04:35+0900\n"
-"PO-Revision-Date: 2008-03-03 04:36+0900\n"
+"POT-Creation-Date: 2008-07-29 16:31+0900\n"
+"PO-Revision-Date: 2008-07-29 16:31+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\n"
 "MIME-Version: 1.0\n"
@@ -21,28 +22,27 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution addressbook"
 msgstr "에볼루션 주소록"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../a11y/addressbook/ea-minicard-view.c:32
 #: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "새 연락처"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../a11y/addressbook/ea-minicard-view.c:33
 #: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "새 연락처 목록"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "현재 주소록 폴더 %s에 카드 %d개가 들어 있습니다"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "열기"
 
@@ -157,7 +157,7 @@ msgid "calendar view for one or more days"
 msgstr "달력 보기, 일 단위"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:758
 msgid "%A %d %b %Y"
 msgstr "%Y년 %b %e일 %A"
 
@@ -168,20 +168,18 @@ msgstr "%Y년 %b %e일 %A"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:1363
-#: ../calendar/gui/e-day-view.c:2162
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/calendar-component.c:761
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
+#: ../calendar/gui/e-week-view-main-item.c:340
 msgid "%a %d %b"
 msgstr "%b %e일 (%a)"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:768
+#: ../calendar/gui/calendar-component.c:770
 msgid "%a %d %b %Y"
 msgstr "%Y년 %b %e일 (%a)"
 
@@ -189,10 +187,10 @@ msgstr "%Y년 %b %e일 (%a)"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:797
 msgid "%d %b %Y"
 msgstr "%Y년 %b %e일"
 
@@ -202,17 +200,15 @@ msgstr "%Y년 %b %e일"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:1367
-#: ../calendar/gui/e-day-view.c:2178
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/calendar-component.c:787
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
+#: ../calendar/gui/e-week-view-main-item.c:354
 msgid "%d %b"
 msgstr "%b %d"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:247
 #: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:772
+#: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "그놈 달력"
 
@@ -325,34 +321,34 @@ msgstr "달력: %s에서 %s까지"
 msgid "evolution calendar item"
 msgstr "에볼루션 달력 항목"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:39
 msgid "Combo Button"
 msgstr "콤보 단추"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:49
 msgid "Activate Default"
 msgstr "기본값 활성화"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:51
 msgid "Popup Menu"
 msgstr "팝업 메뉴"
 
-#: ../a11y/widgets/ea-expander.c:40
+#: ../a11y/widgets/ea-expander.c:39
 msgid "Toggle Attachment Bar"
 msgstr "첨부 모음 토글"
 
-#: ../a11y/widgets/ea-expander.c:50
+#: ../a11y/widgets/ea-expander.c:49
 msgid "activate"
 msgstr "활성화"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr ""
-"'{0}'은(는) 읽기 전용 주소록 소스입니다. 연락처 보기로 바꾸고 연락처를 저장"
-"할 수 있는 주소록을 선택하십시오."
+"'{0}'은(는) 읽기 전용 달력이므로 내용을 바꿀 수 없습니다. 가장자리 창의 연락"
+"처 보기에서 다른 주소록을 선택하십시오."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -400,7 +396,7 @@ msgstr "주소록을 지울 수 없습니다."
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
 "현재 에볼루션에서는 그룹와이즈 시스템 주소록만 접근할 수 있습니다. 일단 다른 "
 "그룹와이즈 메일 클라이언트를 사용해서 그룹와이즈 자주 쓰는 연락처 및 그룹와이"
@@ -424,7 +420,7 @@ msgstr "LDAP 서버에서 인증이 실패했습니다."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
 msgid "Failed to delete contact"
 msgstr "연락처를 지우는 데 실패했습니다"
 
@@ -437,27 +433,23 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP 서버가 올바른 스키마 정보가 들어 있는 응답을 하지 않았습니다."
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "권한이 거부되었습니다."
-
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "서버 버전"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr "이 서버에서는 일부 기능이 제대로 동작하지 않을 수도 있습니다"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "에볼루션 주소록이 갑자기 끝났습니다."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "선택한 그림 크기가 큽니다. 크기를 조정해서 저장하시겠습니까?"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:23
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -466,19 +458,19 @@ msgstr ""
 "LDAP 서버가 이 기능을 지원하지 않는 LDAP 과거 버전을 사용할 수도 있고, 설정"
 "이 틀렸을 수도 있습니다. 지원하는 찾기 기준에 대해 관리자에게 문의하십시오."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book will be removed permanently."
 msgstr "주소록을 영원히 지웁니다."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This addressbook could not be opened."
 msgstr "주소록을 열 수 없습니다."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "제안하신 찾기 기준 중에서 주소록 서버에 아무 것도 없습니다."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -486,27 +478,27 @@ msgstr ""
 "주소록 서버에 접근할 수 없거나 서버 이름을 잘못 입력했을 거나 네트워크 연결"
 "이 끊어졌을 것입니다."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "이 서버는 LDAPv3 스키마 정보를 지원하지 않습니다."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to open addressbook"
 msgstr "주소록을 열 수 없습니다"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "찾기를 수행할 수 없습니다."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "{0}을(를) 저장할 수 없습니다."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "바뀐 부분을 저장하시겠습니까?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -514,7 +506,7 @@ msgstr ""
 "연락처를 한 주소록에서 다른 주소록으로 옮기려고 하지만 원래 주소록에서 연락처"
 "를 지울 수 없습니다. 옮기는 대신에 복사하시겠습니까?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -524,6 +516,10 @@ msgstr ""
 "제가 발생할 수도 있습니다. 서버를 지원하는 버전으로 업그레이드하는 게 가장 좋"
 "습니다."
 
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "이 주소록의 연락처를 지울 권한이 없습니다."
+
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
@@ -560,8 +556,8 @@ msgid "_Use as it is"
 msgstr "그대로 사용(_U)"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -570,17 +566,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "기본 동기화 주소:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
 msgid "Could not load addressbook"
 msgstr "주소록을 읽어들일 수 없습니다"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "파일롯의 Address 프로그램 블록을 읽을 수 없습니다"
 
@@ -602,10 +598,10 @@ msgstr "여기서 자동 완성을 설정합니다"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
 msgstr "연락처"
 
@@ -614,7 +610,7 @@ msgid "Evolution Address Book"
 msgstr "에볼루션 주소록"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
+msgid "Evolution Address Book address popup"
 msgstr "에볼루션 주소록 주소 팝업"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
@@ -646,11 +642,12 @@ msgstr "여기서 S/MIME 인증서를 관리합니다"
 #: ../addressbook/gui/component/addressbook-component.c:144
 #: ../addressbook/gui/component/addressbook-migrate.c:499
 #: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:583 ../calendar/gui/migration.c:1096
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:307
-#: ../mail/mail-vfolder.c:216
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "이 컴퓨터"
 
@@ -663,15 +660,16 @@ msgstr "이 컴퓨터"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:591 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "개인"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "LDAP 서버"
@@ -693,7 +691,7 @@ msgid "Create a new contact list"
 msgstr "새 연락처 목록을 만듭니다"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-config.c:1192
 msgid "New Address Book"
 msgstr "새 주소록"
 
@@ -709,72 +707,72 @@ msgstr "새 주소록을 만듭니다"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "주소록 설정 혹은 폴더를 업그레이드하는 데 실패했습니다."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:315
 msgid "Base"
 msgstr "베이스"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:516
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "종류(_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:618
 msgid "Copy _book content locally for offline operation"
 msgstr "오프라인 작업을 위해 주소록 내용 로컬에 복사(_B)"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/addressbook-config.c:967
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../calendar/gui/dialogs/calendar-setup.c:388
+#: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "일반"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "주소록"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:972
 msgid "Server Information"
 msgstr "서버 정보"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:974
 msgid "Authentication"
 msgstr "인증"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:977
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "자세히"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../addressbook/gui/component/addressbook-config.c:978
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "찾는 중"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:980
 msgid "Downloading"
 msgstr "다운로드하는 중"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1190
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "주소록 속성"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "옮기는 중..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s' 옮기는 중:"
@@ -828,48 +826,48 @@ msgstr ""
 "\n"
 "폴더를 여기에 맞게 변환하는 동안 잠시 기다리십시오..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
+#: ../addressbook/gui/component/addressbook-view.c:430
 #: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" 폴더 이름 바꾸기:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../addressbook/gui/component/addressbook-view.c:433
 #: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "폴더 이름 바꾸기"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
+#: ../addressbook/gui/component/addressbook-view.c:438
 #: ../mail/em-folder-utils.c:511
 msgid "Folder names cannot contain '/'"
 msgstr "폴더 이름에 '/'가 들어갈 수 없습니다"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "_New Address Book"
 msgstr "새 주소록(_N)"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:951
 msgid "Save As vCard..."
 msgstr "vCard로 저장..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1346
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/calendar-component.c:620
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "지우기(_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:957
 msgid "_Properties..."
 msgstr "속성(_P)..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "연락처 원본 선택"
 
@@ -878,19 +876,19 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "익명으로 LDAP 서버 사용"
 
 #: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "인증하는 데 실패했습니다.\n"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s(사용자 %s)의 암호를 입력하십시오"
 
 #: ../addressbook/gui/component/addressbook.c:215
 #: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "암호를 입력하십시오"
@@ -965,104 +963,96 @@ msgid "<b>Authentication</b>"
 msgstr "<b>인증</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>표시</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>다운로드하는 중</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>찾는 중</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>서버 정보</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>종류:</b> "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "주소록을 더합니다"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:777
+#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../mail/em-account-editor.c:761
 msgid "Always"
 msgstr "항상"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "익명으로"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Basic"
 msgstr "기본"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Distinguished name"
 msgstr "고유 이름"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Email address"
 msgstr "전자메일 주소"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr "에볼루션은 이 전자메일 주소를 서버에 인증할 때 사용합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Find Possible Search Bases"
 msgstr "가능한 찾기 기준을 찾기"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Lo_gin:"
 msgstr "로그인(_G):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "사용 안 함"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:304
+#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "암호화 없음"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "One"
 msgstr "한 단계"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:312
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL 암호화"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search Filter"
 msgstr "찾기 필터"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "찾기 기준(_B):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search _filter:"
 msgstr "찾기 필터(_F):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search filter"
 msgstr "찾기 필터"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1071,7 +1061,7 @@ msgstr ""
 "찾기 필터는 찾기를 수행할 때 찾으려는 오브젝트의 종류를 말합니다. 따로 바꾸"
 "지 않으면, 기본값은 \"person\"의 오브젝트에 대해 찾기를 수행합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1079,7 +1069,7 @@ msgstr ""
 "이 옵션을 켜면 LDAP 서버가 SSL을 지원하는 경우에만 에볼루션에서 그 LDAP 서버"
 "에 연결합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1087,7 +1077,7 @@ msgstr ""
 "이 옵션을 켜면 LDAP 서버가 SSL을 지원하는 경우에만 에볼루션에서 그 LDAP 서버"
 "에 연결합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1096,23 +1086,23 @@ msgstr ""
 "이 옵션을 선택하면 서버에서 SSL을 지원하지 않는다는 의미입니다.  연결이 안전"
 "하지 않을 수도 있고, 보안상의 침투에 취약할 수 있습니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Sub"
 msgstr "아래 단계"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "지원하는 찾기 기준"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:308
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS 암호화"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -1121,7 +1111,7 @@ msgstr ""
 "찾기 기준은 찾기를 시작할 항목의 고유 이름(distinguished name, DN)입니다. 찾"
 "기 기준을 비워두면, 디렉토리 트리의 맨 위부터 찾기 시작합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -1132,13 +1122,13 @@ msgstr ""
 "찾기 범위는 찾기 기준 아래의 모든 엔트리에 대해서 찾게 됩니다. 찾기 범위가 "
 "\"한 단계\"이면 찾기 기준에서 한 단계 아래의 엔트리만 포함합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "LDAP 서버의 완전한 이름입니다. 예를 들어 \"ldap.mycompany.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1146,7 +1136,7 @@ msgstr ""
 "다운로드할 항목의 최대 개수입니다. 이 숫자를 너무 크게 하면 주소록 동작이 느"
 "려집니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1155,7 +1145,7 @@ msgstr ""
 "에볼루션에서 인증하는 방법입니다. \"전자메일 주소\"로 설정하면 반드시 LDAP 서"
 "버에 익명 접근이 가능해야 합니다."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1163,7 +1153,7 @@ msgstr ""
 "에볼루션 폴더 목록에 나타날 이 서버의 이름입니다. 표시하는 목적으로만 쓰입니"
 "다. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -1172,75 +1162,75 @@ msgstr ""
 "에볼루션에서 연결할 LDAP 서버의 포트 번호입니다. 표준 포트 번호의 목록이 여"
 "기 있습니다. 어떤 포트를 지정해야 할 지는 시스템 관리자에게 물어보십시오."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "구별되는 이름 (Distinguished Name, DN) 사용해서"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "전자메일 주소 사용해서"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Whenever Possible"
 msgstr "가능하면 언제나"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Address Book"
 msgstr "주소록 추가(_A)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "다운로드 제한(_D):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Find Possible Search Bases"
 msgstr "가능한 찾기 기준 찾기(_F)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Login method:"
 msgstr "로그인 방법(_L):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "이름(_N):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Port:"
 msgstr "포트(_P):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "_Search scope:"
 msgstr "찾기 범위(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "서버(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Timeout:"
 msgstr "제한시간(_T):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Use secure connection:"
 msgstr "보안 연결 사용(_U):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "cards"
 msgstr "카드"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:401
 msgid "minutes"
 msgstr "분"
 
@@ -1281,7 +1271,7 @@ msgid "<b>Work</b>"
 msgstr "<b>직장</b> "
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1293,16 +1283,16 @@ msgid "Ca_tegories..."
 msgstr "분류(_T)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "연락처"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
 msgid "Contact Editor"
 msgstr "연락처 편집기"
 
@@ -1315,7 +1305,7 @@ msgid "Image"
 msgstr "그림"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN 메신저"
 
@@ -1328,7 +1318,7 @@ msgid "Nic_kname:"
 msgstr "별명(_K):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "노벨 그룹와이즈"
 
@@ -1342,11 +1332,11 @@ msgstr "전화"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "업무"
 
@@ -1368,7 +1358,7 @@ msgid "_Birthday:"
 msgstr "생일(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
@@ -1459,1119 +1449,1121 @@ msgstr "위치(_W):"
 msgid "_Zip/Postal Code:"
 msgstr "우편 번호(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "주소"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "편집 가능"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "미국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "아프가니스탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "알바니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "알제리"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "미국령 사모아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "안도라"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "앙골라"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "앙귈라"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "남극"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Antigua And Barbuda"
 msgstr "안티가 바부다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "아르헨티나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "아르메니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "아루바"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "오스트레일리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "오스트리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "아제르바이잔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "바하마"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "바레인"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "방글라데시"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "바르바도스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "벨라루스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "벨기에"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "벨리즈"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "베닌"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "버뮤다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "부탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "볼리비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bosnia And Herzegowina"
 msgstr "보스니아 헤르체코비나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "보츠와나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "보우벳 섬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "브라질"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "British Indian Ocean Territory"
 msgstr "영국령 인도양 자치구역"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "브루나이 다루살람"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "불가리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "부르키나 파소"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "부룬디"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "캄보디아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "카메룬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "캐나다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "케이프 베르드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "케이만 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Central African Republic"
 msgstr "중앙 아프리카 공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "챠드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "칠레"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "중국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "크리스마스 섬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Cocos (Keeling) Islands"
 msgstr "코코스 (킬링) 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "콜롬비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "코모로스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "콩고"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Congo, The Democratic Republic Of The"
 msgstr "콩고 민주 공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "쿡 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "코스타리카"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "코트 디브와르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "크로아티아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "쿠바"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "사이프러스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "체코 공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "덴마크"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "지부티"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "도미니카"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "도미니카 공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "에쿠아도르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "이집트"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "엘 살바도르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "적도기니"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "에리트리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "에스토니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "에티오피아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "포클랜드 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "패로 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "피지"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "핀란드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "프랑스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "프랑스령 기아나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "프랑스령 폴리네시아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "French Southern Territories"
 msgstr "프랑스령 남 자치구역"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "가봉"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "감비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "그루지아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "독일"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "가나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "지브롤터"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "그리스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "그린란드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "그레나다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "과달루프"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "괌"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "과테말라"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "건지"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "기니"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guinea-Bissau"
 msgstr "기니비사우"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "가이아나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "하이티"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Heard And McDonald Islands"
 msgstr "허드 맥도널드 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "바티칸"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "혼두라스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "홍콩"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "헝가리"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "아이슬란드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "인도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "인도네시아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "이란"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "이라크"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "아이랜드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Isle of Man"
 msgstr "맨 섬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "이스라엘"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "이탈리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "자메이카"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "일본"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "저지"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "요르단"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "카자흐스탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "케냐"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "키리바티"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "조선민주주의인민공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Korea, Republic Of"
 msgstr "대한민국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "쿠웨이트"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "키르기즈스탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "라오스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "라트비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "레바논"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "레소토"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "라이베리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "리비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "리히텐슈타인"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "리투아니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "룩셈부르크"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "마카오"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "마케도니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "마다가스카르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "말라위"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "말레이시아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "몰디브"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "말리"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "몰타"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "마샬 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "마르띠니크"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "모리타니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "모리셔스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "마요트"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "멕시코"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "미크로네시아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Moldova, Republic Of"
 msgstr "몰도바"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "모나코"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "몽골"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "몽세라트"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "모로코"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "모잠비크"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "미얀마"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "나미비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "나우루"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "네팔"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "네덜란드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "네덜란드령 앤틸레스 열도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "뉴 칼레도니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "뉴질랜드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "니카라과"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "니제르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "나이지리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "니우에"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "노퍽 섬"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Northern Mariana Islands"
 msgstr "북 마리아나 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "노르웨이"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "오만"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "파키스탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "팔라우"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "팔레스타인 자치구역"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "파나마"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Papua New Guinea"
 msgstr "파푸아 뉴기니"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "파라과이"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "페루"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "필리핀"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "피트케언"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "폴란드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "포르투갈"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "푸에르토리코"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "카타르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "레위니옹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "루마니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "러시아 연방"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "르완다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Kitts And Nevis"
 msgstr "세인트 키츠 네비스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "세인트 루시아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Saint Vincent And The Grenadines"
 msgstr "세인트 빈센트 그레나다인즈"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "사모아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "산마리노"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Sao Tome And Principe"
 msgstr "상투메 프린시페"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "사우디아라비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "세네갈"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Serbia And Montenegro"
 msgstr "세르비아 몬테네그로"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "세이셸"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "시에라리온"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "싱가폴"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "슬로바키아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "슬로베니아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "솔로몬 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "소말리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "남 아프리카 공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "남 조지아 남 샌드위치 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "스페인"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "스리랑카"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "세인트 헬레나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "쌩 피에르 미켈론"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "수단"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "수리남"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "스발바르드 얀마이엔 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "스와질란드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "스웨덴"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "스위스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "시리아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "타이완"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "타지키스탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tanzania, United Republic Of"
 msgstr "탄자니아 연방 공화국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "태국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "동티모르"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "토고"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "토켈로"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "통가"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Trinidad And Tobago"
 msgstr "트리니다드 토바고"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "튀니지"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "터키"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "투르크멘"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Turks And Caicos Islands"
 msgstr "터크 스케이커스 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "투발루"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "우간다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "우크라이나"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Arab Emirates"
 msgstr "아랍에미리트연합"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "영국"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "United States Minor Outlying Islands"
 msgstr "미국령 소군도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "우르과이"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "우즈베키스탄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "바누아투"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "베네수엘라"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "베트남"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, British"
 msgstr "버진 제도, 영국령"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Virgin Islands, U.S."
 msgstr "버진 제도, 미국령"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Wallis And Futuna Islands"
 msgstr "왈리스 후투나 제도"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "서부 사하라"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "예멘"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "잠비아"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "짐바브웨"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../plugins/exchange-operations/exchange-delegates.c:952
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
+#: ../plugins/plugin-manager/plugin-manager.c:41
+#: ../plugins/save-attachments/save-attachments.c:350
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "이름"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "AOL Instant Messenger"
 msgstr "AOL 인스턴스 메신저"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "재버"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Yahoo Messenger"
 msgstr "야후 메신저"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "가두가두 메신저"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
 msgid "Service"
 msgstr "서비스"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "위치"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "사용자이름"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "집"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "기타"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "야후"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "가두가두"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "그룹와이즈"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
 msgid "Source Book"
 msgstr "원본 주소록"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Target Book"
 msgstr "대상 주소록"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
 msgid "Is New Contact"
 msgstr "새 연락처"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Writable Fields"
 msgstr "쓰기 가능한 필드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Required Fields"
 msgstr "필수 필드"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "바뀜"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "연락처 편집 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "Please select an image for this contact"
 msgstr "이 연락처에 사용할 그림을 선택하십시오"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "_No image"
 msgstr "그림 없음(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2579,47 +2571,47 @@ msgstr ""
 "연락처 데이터가 잘못되었습니다:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s'에 잘못된 형식이 들어 있습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s'에 잘못된 형식이 들어 있습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s'이(가) 비어 있습니다"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
 msgid "Invalid contact."
 msgstr "연락처가 잘못되었습니다."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "연락처 빠른 추가"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "정식 이름 편집(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "전체 이름(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "전자 메일(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "주소록 선택(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2628,7 +2620,7 @@ msgstr ""
 "정말로 연락처 목록을 (%s)\n"
 "지우시겠습니까?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2636,7 +2628,7 @@ msgstr ""
 "정말로 이 연락처 목록을\n"
 "지우시겠습니까?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2645,7 +2637,7 @@ msgstr ""
 "정말로 연락처를 (%s)\n"
 "지우시겠습니까?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2788,12 +2780,17 @@ msgstr "메일주소를 입력하거나 연락처를 아래의 목록으로 끌�
 msgid "Contact List Members"
 msgstr "연락처 목록 구성원"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+msgid "_Members"
+msgstr "구성원(_M)"
+
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
 #: ../addressbook/gui/widgets/e-addressbook-model.c:298
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:217
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "북"
 
@@ -2801,10 +2798,6 @@ msgstr "북"
 msgid "Is New List"
 msgstr "새 목록"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "구성원(_M)"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "바뀐 연락처:"
@@ -2824,7 +2817,7 @@ msgid ""
 "like to add it anyway?"
 msgstr ""
 "이 연락처의 이름이나 메일 주소가 이미 이 폴더에 들어 있습니다. 그래도 연락처"
-"를 더하시겠습니까?"
+"를 추가하시겠습니까?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2840,42 +2833,42 @@ msgid ""
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
 "이 폴더에 이 연락처와 같은 이름이나 같은 메일 주소가 이미 들어 있습니다.\n"
-"그래도 연락처를 더하시겠습니까?"
+"그래도 연락처를 추가하시겠습니까?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
 msgid "Merge Contact"
 msgstr "연락처 합치기"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "합치기(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:860
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "전자메일"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
-#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "필드에 포함"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "전자메일 시작"
 
+# FIXME - hard to translate UI + string based on English grammar
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "이름 시작"
+msgid "Name contains"
+msgstr "이름에 포함"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2889,9 +2882,9 @@ msgstr[0] "연락처 %d개"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "쿼리"
 
@@ -2902,9 +2895,9 @@ msgstr "주소록 보기를 가져오는 데 오류가 발생했습니다"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../widgets/text/e-text.c:3551
+#: ../widgets/table/e-table.c:3353
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "모델"
 
@@ -2912,108 +2905,110 @@ msgstr "모델"
 msgid "Error modifying card"
 msgstr "카드를 바꾸는 데 오류가 발생했습니다"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+msgid "Name begins with"
+msgstr "이름 시작"
+
 # FIXME - 무슨 뜻?
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "소스"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../calendar/gui/e-meeting-list-view.c:508
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "형태"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
 msgid "Save as vCard..."
 msgstr "vCard로 저장..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1566
+#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "열기(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "새 연락처(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "새 연락처 목록(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "vCard로 저장(_S)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "연락처 전달(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "연락처 전달(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "연락처로 메세지 보내기(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "리스트로 메세지 보내기(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "연락처로 메세지 보내기(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "인쇄(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "주소록으로 복사(_Y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "주소록으로 이동(_V)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "잘라내기(_T)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:1013
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1574
+#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "복사(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "붙여 넣기(_A)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
-#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
-#: ../calendar/gui/cal-search-bar.c:681
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
+#: ../calendar/gui/cal-search-bar.c:680
 msgid "Any Category"
 msgstr "모든 분류"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "기타 오류"
 
@@ -3048,7 +3043,7 @@ msgstr "카폰"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:169
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3150,9 +3145,9 @@ msgid "Radio"
 msgstr "무선"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:713
 msgid "Role"
 msgstr "역할"
 
@@ -3189,38 +3184,38 @@ msgid "Web Site"
 msgstr "웹 사이트"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
 #: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
+#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "너비"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "높이"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "촛점이 있는 지"
 
@@ -3240,11 +3235,21 @@ msgstr "텍스트 모델"
 msgid "Max field name length"
 msgstr "최대 필드 이름 길이"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
 msgid "Column Width"
 msgstr "열 너비"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"연락처를 찾는 중입니다..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3258,7 +3263,7 @@ msgstr ""
 "\n"
 "새 연락처를 만드려면 마우스를 두번 누르십시오."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3272,7 +3277,7 @@ msgstr ""
 "\n"
 "새 연락처를 만드려면 마우스를 두번 누르십시오."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3282,7 +3287,7 @@ msgstr ""
 "\n"
 "연락처 찾기."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3293,40 +3298,41 @@ msgstr ""
 "여기에서 볼 수 있는 항목이 없습니다."
 
 # FIXME - 무슨 뜻?
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "어댑터"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "업무 전자메일"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "집 전자메일"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "기타 전자메일"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "선택됨"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "커서가 있는 지"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
 msgid "_Open Link in Browser"
 msgstr "브라우저에서 링크 열기(_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "링크 위치 복사(_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
 msgid "_Send New Message To..."
 msgstr "새 메세지 보내기(_S)..."
 
@@ -3349,7 +3355,7 @@ msgstr "지도"
 
 # List는 여기서 Mailing List를 말한다
 #: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "리스트 구성원"
 
@@ -3370,15 +3376,15 @@ msgid "Video Chat"
 msgstr "화상 대화"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/gnome-cal.c:2376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:574
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
 #: ../plugins/hula-account-setup/camel-hula-listener.c:378
 #: ../plugins/hula-account-setup/camel-hula-listener.c:407
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -3388,8 +3394,7 @@ msgstr "달력"
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "약속 있음/없음"
 
@@ -3411,125 +3416,127 @@ msgid "Web Log"
 msgstr "웹로그"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "생일"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2336
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "기념일"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "직함"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "홈페이지"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "블로그"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "성공했습니다"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "백엔드를 사용중입니다"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "저장고가 연결되지 않았습니다"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "주소록이 없습니다"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "No Self Contact defined"
 msgstr "내 연락처를 정의하지 않았습니다"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "권한이 거부되었습니다"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "연락처를 찾을 수 없습니다"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "연락처 ID가 이미 있습니다"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "프로토콜이 지원되지 않습니다"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:635 ../calendar/gui/print.c:2523
 msgid "Canceled"
 msgstr "취소함"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "취소할 수 없습니다"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 #: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "인증이 실패했습니다"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "인증이 필요합니다"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "TLS를 사용할 수 없습니다"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "그런 소스가 없습니다"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "오프라인 모드에서는 사용할 수 없습니다"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "서버 버전이 잘못되었습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#: ../addressbook/gui/widgets/eab-gui-util.c:101
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3539,7 +3546,7 @@ msgstr ""
 "않았거나 아직 오프라인에서 사용할 수 있게 다운로드하지 않은 상태입니다. 온라"
 "인 모드에서 주소록을 다시 읽어들여서 그 내용을 내려 받으십시오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3548,7 +3555,7 @@ msgstr ""
 "이 주소록을 열 수 없습니다.  해당 경로가 (%s) 있고 그 경로에 접근할 권한이 있"
 "는 지 확인하십시오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3556,7 +3563,7 @@ msgstr ""
 "이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 LDAP 서버에 연결"
 "할 수 없습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3565,7 +3572,7 @@ msgstr ""
 "이 에볼루션 버전에는 LDAP 지원 기능을 컴파일하지 않았습니다.  LDAP를 사용하려"
 "면 LDAP를 지원하는 에볼루션을 설치해야 합니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3573,7 +3580,7 @@ msgstr ""
 "이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 서버에 연결할 수 "
 "없습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3585,7 +3592,7 @@ msgstr ""
 "좀 더 구체적으로 찾거나 주소록의 디렉토리 서버 기본 설정에서 \n"
 "결과의 한계치를 지정해 주십시오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3596,45 +3603,45 @@ msgstr ""
 "넘었습니다.  좀 더 구체적으로 찾거나 주소록의 디렉토리 서버 기본 설정에서\n"
 "결과의 한계치를 지정해 주십시오."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "이 주소록의 벡엔드에서 이 질의를 파싱할 수 없습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:169
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "이 주소록의 벡엔드에서 이 질의를 수행하길 거부했습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid "This query did not complete successfully."
 msgstr "이 질의가 성공적으로 끝나지 않았습니다."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
 msgid "Error adding list"
-msgstr "목록을 더하는 중 오류가 발생했습니다"
+msgstr "목록을 추가하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
 #: ../addressbook/gui/widgets/eab-gui-util.c:670
 msgid "Error adding contact"
-msgstr "연락처를 더하는 중 오류가 발생했습니다"
+msgstr "연락처를 추가하는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error modifying list"
 msgstr "목록을 고치는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error modifying contact"
 msgstr "연락처를 고치는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error removing list"
 msgstr "목록을 지우는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 #: ../addressbook/gui/widgets/eab-gui-util.c:620
 msgid "Error removing contact"
 msgstr "연락처를 지우는 중 오류가 발생했습니다"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:299
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3646,16 +3653,16 @@ msgstr[0] ""
 "연락처 %d개를 열면 %d개의 새 창을 열게 됩니다.\n"
 "정말로 이 연락처를 전부 여시겠습니까?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:307
 msgid "_Don't Display"
 msgstr "표시하지 않기(_D)"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
 msgid "Display _All Contacts"
 msgstr "모든 연락처 표시(_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:334
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3664,7 +3671,7 @@ msgstr ""
 "%s이(가) 이미 존재합니다\n"
 "이 파일을 덮어 쓰시겠습니까?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:338
 msgid "Overwrite"
 msgstr "덮어 쓰기"
 
@@ -3708,27 +3715,27 @@ msgstr "연락처 이동"
 msgid "Copy contacts to"
 msgstr "연락처 복사"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:883
 msgid "Multiple vCards"
 msgstr "여러 개 vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 #, c-format
 msgid "vCard for %s"
 msgstr "%s에 대한 vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:928
 #, c-format
 msgid "Contact information"
 msgstr "연락처 정보"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:930
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s에 대한 연락처 정보"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
 msgid "Querying Address Book..."
 msgstr "주소록 질의중입니다..."
 
@@ -3755,45 +3762,45 @@ msgstr "주소록에 저장"
 msgid "Card View"
 msgstr "카드: "
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../addressbook/importers/evolution-csv-importer.c:658
+#: ../addressbook/importers/evolution-ldif-importer.c:498
 #: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "가져오는 중..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV 혹은 TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
-msgstr "Outlook CSV 및 TAB 가져오기 프로그램"
+msgstr "Outlook CSV 및 TAB 가져오기"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV 혹은 TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
-msgstr "Mozilla CSV 및 TAB 가져오기 프로그램"
+msgstr "Mozilla CSV 및 TAB 가져오기"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "에볼루션 CSV 혹은 TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
-msgstr "에볼루션 CSV 및 TAB 가져오기 프로그램"
+msgstr "에볼루션 CSV 및 TAB 가져오기"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP 데이터 교환 형식 (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
-msgstr "에볼루션 LDIF 가져오기 프로그램"
+msgstr "에볼루션 LDIF 가져오기"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "vCard (.vcf, .gcrd)"
@@ -3801,7 +3808,7 @@ msgstr "vCard (.vcf, .gcrd)"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution vCard Importer"
-msgstr "에볼루션 vCard 가져오기 프로그램"
+msgstr "에볼루션 vCard 가져오기"
 
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3844,11 +3851,11 @@ msgid "Format"
 msgstr "형식"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
 #: ../widgets/table/e-table-field-chooser-item.c:648
 #: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-header-item.c:1908
 #: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
 msgstr "머리말:"
@@ -3951,7 +3958,7 @@ msgstr "명암"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
+#: ../plugins/exchange-operations/exchange-account-setup.c:1055
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -3970,7 +3977,7 @@ msgid "Top:"
 msgstr "위:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:153
 msgid "Type:"
 msgstr "형태:"
 
@@ -4079,13 +4086,22 @@ msgstr "처리하지 못한 오류"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
-"'{0}'은(는) 읽기 전용 달력 소스입니다. 달력 보기로 바꾸고 약속을 저장할 수 있"
-"는 달력을 선택하십시오."
+"'{0}'은(는) 읽기 전용 달력이므로 내용을 바꿀 수 없습니다. 가장자리 창의 달력 "
+"보기에서 다른 달력을 선택하십시오."
 
-#: ../calendar/calendar.error.xml.h:3
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:4
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr ""
+"'{0}'은(는) 읽기 전용 달력이므로 내용을 바꿀 수 없습니다. 약속을 저장할 수 있"
+"는 다른 달력을 선택하십시오."
+
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
@@ -4093,7 +4109,7 @@ msgstr ""
 "약속에 의미있는 요약문을 써야 받는 사람이 약속이 무엇에 관한 약속인지 알 수 "
 "있습니다."
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:6
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
@@ -4101,133 +4117,137 @@ msgstr ""
 "작업에 의미있는 요약문을 써야 받는 사람이 작업이 무엇에 관한 작업인지 알 수 "
 "있습니다."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr "이 메모에 들어 있는 모든 정보를 지울 것이고 복구할 수 없게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr "이 메모에 들어 있는 모든 정보를 지울 것이고 복구할 수 없게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr "이 약속에 들어 있는 모든 정보를 지울 것이고 복구할 수 없게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "이 작업에 들어 있는 모든 정보를 지울 것이고 복구할 수 없게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:11
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr "이 약속에 들어 있는 모든 정보를 지울 것이고 복구할 수 없게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:12
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr "이 모임에 들어 있는 모든 정보를 지울 것이고 복구할 수 없게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr "이 메모에 들어 있는 모든 정보를 지울 것이고 복구할 수 없게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "이 작업에 들어 있는 모든 정보를 지울 것이고 복구할 수 없게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "정말로 이 '{0}' 작업을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "정말로 '{0}' 약속을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "정말로 이 '{0}' 메모를 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "정말로 '{0}' 약속을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "정말로 '{0}' 메모를 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "정말로 '{0}' 작업을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "정말로 이 약속을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:179
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "정말로 이 모임을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:21
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "정말로 이 메모를 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "정말 이 작업을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "정말로 요약문 없는 메모를 저장하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "정말로 요약문 없는 약속을 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "정말로 요약문 없는 작업을 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "새 행사를 만들 수 없습니다"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "행사를 저장할 수 없습니다"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "'{0}' 달력을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "'{0}' 메모 목록을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "'{0}' 작업 목록을 지우시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "보내지 않기(_N)"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "다운로드하는 중입니다. 이 약속을 저장하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "다운로드하는 중입니다. 이 작업을 저장하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "편집 창을 읽어들일 수 없습니다."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4235,25 +4255,25 @@ msgstr ""
 "전자메일로 초대 메세지를 모든 참가자에게 보내고 참가자들이 이 작업을 수락하도"
 "록 합니다."
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "전자메일로 초대 메세지를 모든 참가자에게 보내고 참가자들이 응답하도록 합니다."
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "달력을 읽어들이는 데 오류"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "메모 목록을 읽어들이는 데 오류"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "작업 목록을 읽어들이는 데 오류"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4261,7 +4281,7 @@ msgstr ""
 "취소 공지를 보내지 않으면, 다른 참가자들이 이 모임을 취소했다는 사실을 알 지 "
 "못할 수도 있습니다."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -4269,7 +4289,7 @@ msgstr ""
 "취소 공지를 보내지 않으면, 다른 참가자들이 이 메모를 지웠다는 사실을 알 지 못"
 "할 수도 있습니다."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -4277,7 +4297,7 @@ msgstr ""
 "취소 공지를 보내지 않으면, 다른 참가자들이 이 작업을 지웠다는 사실을 알 지 못"
 "할 수도 있습니다."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4285,7 +4305,7 @@ msgstr ""
 "업데이트한 정보를 보내면 그걸 이용해서 다른 참가자들이 달력을 업데이트할 수 "
 "있습니다."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4293,7 +4313,7 @@ msgstr ""
 "업데이트한 정보를 보내면 그걸 이용해서 다른 참가자들이 작업 목록을 업데이트"
 "할 수 있습니다."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4301,7 +4321,7 @@ msgstr ""
 "다운로드 중인 첨부가 있습니다. 약속을 지금 저장하면 다운로드 중인 첨부를 잃어"
 "버리게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4309,83 +4329,83 @@ msgstr ""
 "다운로드 중인 첨부가 있습니다. 작업을 지금 저장하면 다운로드 중인 첨부를 잃어"
 "버리게 됩니다."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr "현재 서버에서는 일부 기능이 제대로 동작하지 않을 수도 있습니다."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "에볼루션 달력이 예상치 못하게 끝났습니다."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "에볼루션 메모가 예상치 못하게 끝났습니다."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "에볼루션 작업이 예상치 못하게 끝났습니다."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "이 달력은 오프라인에서 사용할 수 있게 표시하지 않았습니다."
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "The memo list is not marked for offline usage"
-msgstr "메모 목록이 오프라인에서 사용할 수 있게 표시하지 않았습니다"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The memo list is not marked for offline usage."
+msgstr "메모 목록이 오프라인에서 사용할 수 있게 표시하지 않았습니다."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
 msgstr "작업 목록이 오프라인에서 사용할 수 있게 표시하지 않았습니다."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "이 달력은 완전히 지워집니다."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "이 메모 목록은 완전히 지워집니다."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "이 작업 목록은 완전히 지워집니다."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "바뀐 부분을 이 약속에 저장하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "바뀐 부분을 이 메모에 저장하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "바뀐 부분을 이 작업에 저장하시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "이 메모에 대한 취소 공지를 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "모든 참가자에게 취소 공지를 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "모임 정보를 참가자들에게 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "이 작업을 참가자들에게 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "업데이트한 모임 정보를 참가자들에게 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr "업데이트한 작업 정보를 참가자들에게 보내시겠습니까?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4395,108 +4415,107 @@ msgstr ""
 "제가 발생할 수도 있습니다. 서버를 지원하는 버전으로 업그레이드하는 게 가장 좋"
 "습니다."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "약속에 바뀐 사항이 있지만, 아직 저장하지 않았습니다."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "작업에 바뀐 사항이 있지만, 아직 저장하지 않았습니다."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "메모에 바뀐 사항이 있지만, 아직 저장하지 않았습니다."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "에볼루션을 다시 시작할 때까지는 달력을 사용할 수 없습니다."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "에볼루션을 다시 시작할 때까지는 메모를 사용할 수 없습니다."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "에볼루션을 다시 시작할 때까지는 작업을 사용할 수 없습니다."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:75
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "바뀐 내용 버리기(_D)"
 
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "저장(_S)"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "바뀐 내용 저장(_S)"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:78
 #: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "보내기(_S)"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "공지사항 보내기(_S)"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "여러 날에 걸친 행사 분리:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-server를 시작할 수 없습니다"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "파일롯의 Calendar 프로그램 블록을 읽을 수 없습니다"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "파일롯의 Memo 프로그램 블록을 읽을 수 없습니다"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "파일롯의 Memo 프로그램 블록에 쓸 수 없습니다"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "기본 우선순위:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "파일롯의 ToDo 프로그램 블록을 읽을 수 없습니다"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "파일롯의 ToDo 프로그램 블록에 쓸 수 없습니다"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "달력 및 작업"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:1403
 msgid "Calendars"
 msgstr "달력"
 
@@ -4537,25 +4556,25 @@ msgid "Memo_s"
 msgstr "메모(_S)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1152
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
+#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "메모"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1442
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
+#: ../calendar/gui/e-calendar-table.c:696 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
+#: ../calendar/gui/tasks-component.c:540
+#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/importers/icalendar-importer.c:74
+#: ../calendar/importers/icalendar-importer.c:735
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "작업"
@@ -4574,23 +4593,23 @@ msgstr "작업(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "에볼루션 달력 알림 서비스"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "분"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:402
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "시간"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "시작 시각"
 
@@ -4601,9 +4620,9 @@ msgstr "약속"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "위치:"
@@ -4613,17 +4632,15 @@ msgid "Snooze _time:"
 msgstr "연기할 시간(_T):"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:52
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:41
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "편집(_E)"
 
@@ -4635,33 +4652,33 @@ msgstr "연기 모드(_S)"
 msgid "location of appointment"
 msgstr "약속 장소"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
 msgid "No summary available."
 msgstr "요약이 없습니다."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
 msgid "No description available."
 msgstr "설명이 없습니다."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
 msgid "No location information available."
 msgstr "위치 정보가 없습니다."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
 #, c-format
 msgid "You have %d alarms"
 msgstr "%d개 알림이 있습니다"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1677
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1705
+#: ../mail/mail-component.c:1585
 msgid "Warning"
 msgstr "경고"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1681
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4674,7 +4691,7 @@ msgstr ""
 "보내는 대신 일반적인 미리 알림 대화 상자를 표시합니다."
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4691,20 +4708,20 @@ msgstr ""
 "\n"
 "정말로 이 프로그램을 실행하시겠습니까?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
 msgid "Do not ask me about this program again."
 msgstr "이 메세지를 다시 보지 않습니다."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "보노보를 초기화 할 수 없습니다"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
 msgstr ""
-"알림 기능 서비스 팩토리를 만들 수가 없습니다. 아마도 이미 동작하는 것 같습니"
+"알림 기능 서비스 팩토리를 만들 수 없습니다. 아마도 이미 동작하는 것 같습니"
 "다..."
 
 #: ../calendar/gui/alarm-notify/util.c:41
@@ -4712,7 +4729,7 @@ msgid "invalid time"
 msgstr "잘못된 시간"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d hour"
@@ -4720,7 +4737,7 @@ msgid_plural "%d hours"
 msgstr[0] "%d시간"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
 #: ../calendar/gui/misc.c:119
 #, c-format
 msgid "%d minute"
@@ -4730,7 +4747,7 @@ msgstr[0] "%d분"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
 #: ../calendar/gui/misc.c:123
 #, c-format
 msgid "%d second"
@@ -4975,12 +4992,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "행사/작업/모임 편집에서 상태 항목 표시"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show the \"Preview\" pane"
 msgstr "\"미리 보기\" 창 표시"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show the \"Preview\" pane."
 msgstr "\"미리 보기\" 창을 표시합니다."
 
@@ -5161,68 +5178,68 @@ msgstr "근무일에 시작하는 분"
 msgid "daylight savings time"
 msgstr "일광 절약 시간"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Summary contains"
 msgstr "요약에 포함"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Description contains"
 msgstr "설명에 포함"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Category is"
 msgstr "분류가"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Comment contains"
 msgstr "주석에 포함"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Location contains"
 msgstr "위치에 포함"
 
-#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
-#: ../calendar/gui/cal-search-bar.c:685
+#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
+#: ../calendar/gui/cal-search-bar.c:684
 msgid "Unmatched"
 msgstr "맞지 않음"
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:630
 msgid "Next 7 Days' Tasks"
 msgstr "앞으로 7일 간의 작업"
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:634
 msgid "Active Tasks"
 msgstr "활성화한 작업"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:638
 msgid "Overdue Tasks"
 msgstr "마감이 지난 작업"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:642
 msgid "Completed Tasks"
 msgstr "완료한 작업"
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:646
 msgid "Tasks with Attachments"
 msgstr "첨부가 있는 작업"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:692
 msgid "Active Appointments"
 msgstr "활성화한 약속"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:696
 msgid "Next 7 Days' Appointments"
 msgstr "앞으로 7일 간의 약속"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "인쇄"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:317
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5233,17 +5250,17 @@ msgstr ""
 
 # FIXME - hard to translate UI + string based on English grammar
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "다음보다 오래된 행사 지우기:"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:328
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:397
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../plugins/google-account-setup/google-source.c:403
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "일"
 
@@ -5251,105 +5268,105 @@ msgstr "일"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:512
-#: ../calendar/gui/migration.c:610 ../calendar/gui/migration.c:1123
-#: ../calendar/gui/tasks-component.c:231
+#: ../calendar/gui/calendar-component.c:274
+#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
+#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
+#: ../calendar/gui/tasks-component.c:232
 msgid "On The Web"
 msgstr "웹"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "생일 및 기념일"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "날씨"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:616
 msgid "_New Calendar"
 msgstr "새 달력(_N)"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2102
+#: ../calendar/gui/calendar-component.c:617
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "복사(_C)..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2116
+#: ../calendar/gui/calendar-component.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "속성(_P)"
 
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:950
 msgid "Failed upgrading calendars."
 msgstr "달력을 업그레이드하는 데 실패했습니다."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1249
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "행사와 모임을 만드는 데 '%s' 달력을 열 수 없습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1265
 msgid "There is no calendar available for creating events and meetings"
 msgstr "행사와 모임을 만드는 데 쓸 수 있는 달력이 없습니다"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1378
 msgid "Calendar Source Selector"
 msgstr "달력 소스 선택"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "새 약속"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
 msgid "_Appointment"
 msgstr "약속(_A)"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "새 약속을 만듭니다"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "새 모임"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
 msgid "M_eeting"
 msgstr "모임(_E)"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "새 모임 요청을 만듭니다"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "새 하루 종일 약속"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
 msgid "All Day A_ppointment"
 msgstr "하루 종일 약속(_P)"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "새 하루 종일 약속을 만듭니다"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "새 달력"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Cale_ndar"
 msgstr "달력(_N)"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "새 달력을 만듭니다"
 
@@ -5370,15 +5387,223 @@ msgid "Month View"
 msgstr "월별 보기"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "모든 항목"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "첨부"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "참석자"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "업무"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "분류"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "등급"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "경쟁"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:539
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "비밀"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "설명"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "설명에 포함"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "존재하지 않음"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "존재함"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "즐겨찾기"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "선물"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "목표"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "공휴일"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "명절 카드"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "최신 연락처"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "아이디어"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "국제 문제"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "주요 고객"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "기타"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "앞으로 7일"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "주최자"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "전화 걸기"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:538
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "개인"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:537 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "공개"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:298
+msgid "Recurrence"
+msgstr "반복"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "상태"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "전략"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "요약"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "요약에 포함"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "공급처"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "시간 및 비용"
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "중요 인물"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "기다리기"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "포함"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "포함하지 않음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "같음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "다름"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "달력을 여는 중에 오류가 발생했습니다"
@@ -5391,11 +5616,11 @@ msgstr "달력을 여는 메소드를 지원하지 않습니다"
 msgid "Permission denied to open the calendar"
 msgstr "달력을 열 허가가 거부되었습니다"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
 msgid "Unknown error"
 msgstr "알 수 없는 오류가 발생했습니다"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "알림 편집"
 
@@ -5428,17 +5653,17 @@ msgid "Mes_sage:"
 msgstr "메세지(_S):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "사운드 재생"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "알림 팝업 창 표시"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "프로그램 실행"
 
@@ -5451,7 +5676,7 @@ msgid "Send To:"
 msgstr "보낼 사람:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "전자메일 보내기"
 
@@ -5501,6 +5726,7 @@ msgid "hour(s)"
 msgstr "시간"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:242
 msgid "minute(s)"
 msgstr "분"
 
@@ -5509,7 +5735,7 @@ msgid "start of appointment"
 msgstr "약속 시작"
 
 # Trigger -> 시작 옵션, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
 msgid "Action/Trigger"
 msgstr "동작/시작 옵션"
 
@@ -5521,16 +5747,15 @@ msgstr "추가(_D)"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "알림"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-msg-composer-select-file.c:93
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "첨부 파일의 자동 표시 우선(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
 msgid "Attach file(s)"
 msgstr "파일 첨부"
 
@@ -5598,8 +5823,8 @@ msgid "Display"
 msgstr "표시"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "금요일"
 
@@ -5614,8 +5839,8 @@ msgstr ""
 "일"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "월요일"
 
@@ -5638,7 +5863,7 @@ msgstr ""
 "일요일"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "색을 고르십시오"
 
@@ -5648,8 +5873,8 @@ msgid "S_un"
 msgstr "일(_U)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "토요일"
 
@@ -5668,8 +5893,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "날짜 선택할 때 몇 번째 주인지 표시(_N)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "일요일"
 
@@ -5684,11 +5909,11 @@ msgstr "목(_H)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Template:"
-msgstr "템플리트:"
+msgstr "서식:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "목요일"
 
@@ -5702,14 +5927,14 @@ msgid "Time format:"
 msgstr "시간 형식:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "화요일"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "수요일"
 
@@ -5789,313 +6014,464 @@ msgstr "수(_W)"
 msgid "before every appointment"
 msgstr "전에 미리 알려주기"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:269
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "오프라인 작업을 위해 달력 내용을 로컬에 복사(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "오프라인 작업을 위해 작업 목록 내용을 로컬에 복사(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "오프라인 작업을 위해 메모 목록 내용을 로컬에 복사(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
-msgstr "색(_O):"
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+msgid "Colo_r:"
+msgstr "색(_R):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Task List"
 msgstr "작업 목록"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:389
 msgid "Memo List"
 msgstr "메모 목록"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "Calendar Properties"
 msgstr "달력 속성"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "New Calendar"
 msgstr "새 달력"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "Task List Properties"
 msgstr "작업 목록 속성"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:530
+msgid "New Task List"
+msgstr "새 작업 목록"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
+msgid "Memo List Properties"
+msgstr "메모 목록 속성"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "New Memo List"
 msgstr "새 메모 목록"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "이 행사는 지워졌습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "이 작업은 지워졌습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:66
 msgid "This memo has been deleted."
 msgstr "이 메모는 지워졌습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  바뀐 사항이 있습니다. 이 바뀐 사항을 버리고 편집기를 닫으시겠습니까?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  바뀐 사항이 있습니다. 편집기를 닫으시겠습니까?"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "이 행사는 바뀌었습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "이 작업은 바뀌었습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:90
 msgid "This memo has been changed."
 msgstr "이 메모는 바뀌었습니다."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  바뀐 사항이 있습니다. 이 바뀐 사항을 버리고 편집기를 업데이트하시겠습니"
 "까?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  바뀐 사항이 없습니다. 편집기를 업데이트하시겠습니까?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "유효성 검사 오류: %s"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2340
 msgid " to "
 msgstr "부터 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2344
 msgid " (Completed "
 msgstr " (완료됨 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2346
 msgid "Completed "
 msgstr "완료됨 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2351
 msgid " (Due "
 msgstr " (기한 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2353
 msgid "Due "
 msgstr "기한 "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "첨부한 메시지 - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3037
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
+#: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "첨부한 메세지 %d개"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
-#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "이동(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "드래그 취소(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "첨부"
 
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "오브젝트를 업데이트할 수 없습니다"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "약속 편집"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "모임 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "약속 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "할당한 작업 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "작업 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "메모 - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "요약 없음"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "현재 창을 닫으려면 여기를 누르십시오"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "선택한 메세지를 클립보드로 복사합니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "선택한 텍스트를 클립보드로 잘라냅니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "해당 도움말을 보려면 여기를 누르십시오"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "클립보드에서 텍스트를 붙여 넣습니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "현재 창을 저장하려면 여기를 누르십시오"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "모든 텍스트 선택"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "분류(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
+msgid "_File"
+msgstr "파일(_F)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:45
+msgid "_Help"
+msgstr "도움말(_H)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "넣기(_I)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "옵션(_O)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:54
+msgid "_View"
+msgstr "보기(_V)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "첨부(_A)..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "파일을 첨부하려면 여기를 누르십시오"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "분류(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "분류를 표시할 지 토글합니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "시간대(_Z)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "시간대 항목을 표시할 지 토글합니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "공개(_B)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "공개로 분류"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "개인 정보(_P)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "개인 정보로 분류"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "비밀(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "비밀로 분류"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "역할 항목(_O)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "역할 항목을 표시할 지 토글합니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "응답바람(_R)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "응답요청 항목을 표시할 지 토글합니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "상태 항목(_S)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "상태 항목을 표시할 지 토글합니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "종류 항목(_T)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "참석자 종류를 표시할 지 토글합니다"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "최근 문서(_M)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "첨부"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b>개 첨부"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "첨부 모음 숨기기(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "첨부 모음 보기(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3630
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "지우기(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
-#: ../composer/e-msg-composer.c:3633
+#: ../calendar/gui/dialogs/comp-editor.c:2036
+#: ../composer/e-msg-composer.c:1049
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "첨부파일 추가(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../mail/em-format-html-display.c:2196
 msgid "Show Attachments"
 msgstr "첨부 모음 보기"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "스페이스를 눌러 첨부 모음을 토글하십시오"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
-msgid "Edit Appointment"
-msgstr "약속 편집"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-#, c-format
-msgid "Meeting - %s"
-msgstr "모임 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
-#, c-format
-msgid "Appointment - %s"
-msgstr "약속 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "할당한 작업 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Task - %s"
-msgstr "작업 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
-#, c-format
-msgid "Memo - %s"
-msgstr "메모 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
-msgid "No summary"
-msgstr "요약 없음"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "업데이트가 도착하면 이 항목에 대해 바뀐 사항을 버립니다."
 
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "현재 버전을 사용할 수 없습니다!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "소스를 열 수 없습니다"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "받을 곳을 열 수 없습니다"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "받을 곳이 읽기 전용입니다"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:202
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "이 항목을 다른 수신자의 메일함에서도 지움(_D)"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:53
 msgid "The event could not be deleted due to a corba error"
 msgstr "CORBA 오류때문에 이 행사를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The task could not be deleted due to a corba error"
 msgstr "CORBA 오류때문에 이 작업을 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The memo could not be deleted due to a corba error"
 msgstr "CORBA 오류때문에 이 메모를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:62
 msgid "The item could not be deleted due to a corba error"
 msgstr "CORBA 오류때문에 이 항목을 지울 수 없습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:69
 msgid "The event could not be deleted because permission was denied"
 msgstr "권한이 거부되어 이 행사를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The task could not be deleted because permission was denied"
 msgstr "권한이 거부되어 이 작업을 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The memo could not be deleted because permission was denied"
 msgstr "권한이 거부되어 이 메모를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The item could not be deleted because permission was denied"
 msgstr "권한이 거부되어 이 항목을 지울 수 없습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:85
 msgid "The event could not be deleted due to an error"
 msgstr "오류때문에 이 행사를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:88
 msgid "The task could not be deleted due to an error"
 msgstr "오류때문에 이 작업을 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:91
 msgid "The memo could not be deleted due to an error"
 msgstr "오류때문에 이 메모를 지울 수 없습니다"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:94
 msgid "The item could not be deleted due to an error"
 msgstr "오류때문에 이 항목을 지울 수 없습니다"
 
@@ -6104,7 +6480,7 @@ msgid "Contacts..."
 msgstr "연락처..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To:"
 msgstr "대리인:"
 
@@ -6112,104 +6488,154 @@ msgstr "대리인:"
 msgid "Enter Delegate"
 msgstr "대리인을 입력하십오"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+# Alarm -> 알림, Microsoft Office XP 참고
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "알림(_A)"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr "이 행사에 알림을 설정하거나 해제하려면 여기를 누르십시오"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "반복(_R)"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "반복 행사로 만듭니다"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "보내기 옵션"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "고급 보내기 옵션 넣기"
+
+# event -> 행사, Microsoft Office XP 참고
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "하루 종일 행사(_D)"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "하루 종일 행사가 있는 지 토글합니다"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "시간을 약속 있음으로 표시(_B)"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "시간을 약속 있음으로 표시할 지 토글합니다"
+
+# free/busy -> 약속 있음/없음, Microsoft Office XP 참고
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "약속 있음/없음(_F):"
+
+# free/busy -> 약속 있음/없음, Microsoft Office XP 참고
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "참석자의 약속 있음/없음 정보를 알아봅니다"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "약속(_M)"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "반복"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "행사에 알림이 있습니다."
 
-#: ../calendar/gui/dialogs/event-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "주최자(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "대리인(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "참석자(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "행사에 시작 날짜가 없습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "행사에 끝 날짜가 없습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "시작 날짜가 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "끝 날짜가 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "시작 시각이 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "끝 시각이 틀렸습니다"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "선택하신 주최자가 이제 계정이 없습니다."
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "주최자가 필요합니다."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "최소한 참석자가 한 사람은 필요합니다."
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "추가(_A) "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' 달력을 열 수 없습니다."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "%s 자격으로 작업합니다"
 
 # "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "약속 %d일 전에"
 
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6217,31 +6643,31 @@ msgstr[0] "약속 %d시간 전에"
 
 # "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "약속 %d분 전에"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "사용자 지정"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:943
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../plugins/itip-formatter/itip-formatter.c:2022
+#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-signature-combo-box.c:69
 msgid "None"
 msgstr "없음"
 
@@ -6323,28 +6749,24 @@ msgstr "주최자 바꾸기(_H)"
 msgid "Co_ntacts..."
 msgstr "연락처(_N)..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "주최자"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "주최자:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2448
 msgid "Memo"
 msgstr "메모"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s'의 메모를 열 수 없습니다."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
-#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "받는 사람"
 
@@ -6362,60 +6784,60 @@ msgid "_Description:"
 msgstr "설명(_D):"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "그룹(_G):"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "반복 행사를 고치려고 합니다. 무엇을 고치시겠습니까?"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "반복 행사를 대리하려고 합니다. 무엇을 대리하시겠습니까?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "반복 작업을 고치려고 합니다. 무엇을 고치시겠습니까?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "반복 메모를 고치려고 합니다. 무엇을 고치시겠습니까?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "이 경우만"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "이 경우 및 지나간 경우"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "이 경우 및 앞으로의 경우"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "모든 경우"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "이 약속에는 에볼루션에서 편집할 수 있는 반복이 들어 있습니다."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "반복하는 날짜가 잘못되었습니다"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "요일"
 
@@ -6423,7 +6845,7 @@ msgstr "요일"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "첫번째"
 
@@ -6432,7 +6854,7 @@ msgstr "첫번째"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "초"
 
@@ -6440,7 +6862,7 @@ msgstr "초"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "세번째"
 
@@ -6448,7 +6870,7 @@ msgstr "세번째"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "네번째"
 
@@ -6456,13 +6878,13 @@ msgstr "네번째"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "마지막"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "기타 날짜"
 
@@ -6470,7 +6892,7 @@ msgstr "기타 날짜"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1일부터 10일"
 
@@ -6478,7 +6900,7 @@ msgstr "1일부터 10일"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11일부터 20일"
 
@@ -6486,14 +6908,14 @@ msgstr "11일부터 20일"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "21일부터 31일"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "일"
 
@@ -6502,33 +6924,33 @@ msgstr "일"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "기간:"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "for ... occurrences"
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "번"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "예외 추가"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "고칠 선택 사항을 얻어 올 수 없습니다."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "예외 바꾸기"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "지울 선택 사항을 얻어 올 수 없습니다."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "날짜/시각"
 
@@ -6591,12 +7013,12 @@ msgstr "주"
 msgid "year(s)"
 msgstr "년"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "완료 날짜가 잘못되었습니다"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "웹 페이지"
 
@@ -6611,51 +7033,55 @@ msgstr "<span weight=\"bold\">상태</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:634 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/print.c:2520 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "완료됨"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:559 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "높음"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:633 ../calendar/gui/print.c:2517
 msgid "In Progress"
 msgstr "진행중"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:561 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "낮음"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:560
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "보통"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:632 ../calendar/gui/print.c:2514
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "시작 안함"
 
@@ -6668,7 +7094,7 @@ msgid "Stat_us:"
 msgstr "상태(_U):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:562 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "정의안됨"
 
@@ -6677,7 +7103,7 @@ msgid "_Date completed:"
 msgstr "완료한 날짜(_D):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "우선순위(_P):"
 
@@ -6685,25 +7111,38 @@ msgstr "우선순위(_P):"
 msgid "_Web Page:"
 msgstr "웹 페이지(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "상태 자세히(_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+msgid "Click to change or view the status details of the task"
+msgstr "누르면 작업의 자세한 상태 정보를 바꾸거나 봅니다"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "보내기 옵션(_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/tasks-component.c:1326
 msgid "_Task"
 msgstr "작업(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "작업 자세히"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "주최자(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "마감 날짜가 잘못되었습니다"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s'의 작업을 열 수 없습니다."
@@ -6729,68 +7168,68 @@ msgid "_Due date:"
 msgstr "마감 날짜(_D):"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d일"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d주"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "알 수 없는 동작 수행"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s 약속 시작 전"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s 약속 시작 후"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "약속 시작에 %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s 약속 끝나기 전"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s 약속 끝난 후"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "약속 끝날때 %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s at %s"
 msgstr "%s (%s)"
@@ -6798,80 +7237,64 @@ msgstr "%s (%s)"
 # Trigger -> 시작 옵션, Microsoft Office XP 참고
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "알 수 없는 시작 옵션에 대한 %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "%s URL을 열려면 누르십시오"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:160
-#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
-#: ../shell/e-shell-folder-title-bar.c:593
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:856
 msgid "Untitled"
 msgstr "제목 없음"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:212
-#: ../calendar/gui/e-cal-component-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
 msgstr "시작 날짜:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:225
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-itip-control.c:1201
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-itip-control.c:1218
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "설명:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:261
-#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "웹 페이지:"
 
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-cal-component-preview.c:210
+#: ../calendar/gui/e-itip-control.c:1162
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "요약:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "마감 날짜:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "상태:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "우선 순위:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "공개"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "개인"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "비밀"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "끝 날짜"
@@ -6881,21 +7304,14 @@ msgstr "끝 날짜"
 msgid "Start Date"
 msgstr "시작 날짜"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "Summary"
-msgstr "요약"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "Free"
 msgstr "약속 없음"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "약속 있음"
 
@@ -6910,34 +7326,34 @@ msgstr ""
 "45.436845,125.862501"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:746
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "예"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:165
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "아니오"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
+#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
+#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2046
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "알 수 없음"
 
@@ -6949,159 +7365,185 @@ msgstr "반복됨"
 msgid "Assigned"
 msgstr "예약됨"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
 msgid "Save As..."
 msgstr "다른 이름으로 저장..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2030
 msgid "Select folder to save selected attachments..."
 msgstr "선택한 첨부를 저장할 폴더 선택..."
 
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
 #, c-format
 msgid "untitled_image.%s"
 msgstr "이름없는_그림.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1568
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "다른 이름으로 저장(_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
+#: ../mail/em-popup.c:574
 msgid "Set as _Background"
 msgstr "배경 화면으로 설정(_B)"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "선택한 것 저장(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
 #, c-format
 msgid "Open in %s..."
 msgstr "%s에서 열기..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:330
+msgid "* No Summary *"
+msgstr "* 요약 없음 *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "주최자: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:369
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "주최자: %s"
+
+#: ../calendar/gui/e-calendar-table.c:400
+msgid "Start: "
+msgstr "시작: "
+
+#: ../calendar/gui/e-calendar-table.c:412
+msgid "Due: "
+msgstr "기한: "
+
+#: ../calendar/gui/e-calendar-table.c:581
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:582
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:583
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:584
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:585
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:586
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:587
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:588
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:871
+#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "선택한 오브젝트를 지우는 중입니다"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:807 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1155
+#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "오브젝트를 업데이트하는 중입니다"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1233 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-msg-composer.c:1472
+#: ../calendar/gui/e-calendar-table.c:1340
+#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "다른 이름으로 저장..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-table.c:1563
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "새 작업(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1567 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "웹 페이지 열기(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1669 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1569
+#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "인쇄(_R)..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1689 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1573
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "잘라내기(_U)"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1575
+#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "붙여 넣기(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1579 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "작업 할당(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1580 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "iCalendar로 전달(_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1581
 msgid "_Mark as Complete"
 msgstr "작업 완료 표시(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1582
 msgid "_Mark Selected Tasks as Complete"
 msgstr "선택한 작업을 마친 작업으로 표시(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1583
 msgid "_Mark as Incomplete"
 msgstr "작업 미완료 표시(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1584
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "선택한 작업을 마치지 못한 작업으로 표시(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Delete Selected Tasks"
 msgstr "선택한 작업 지우기(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1826
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "작업을 추가하려면 누르십시오"
@@ -7124,7 +7566,8 @@ msgid "Due date"
 msgstr "마감 날짜"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "우선순위"
 
@@ -7132,113 +7575,94 @@ msgstr "우선순위"
 msgid "Start date"
 msgstr "시작 날짜"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "상태"
-
-#: ../calendar/gui/e-calendar-view.c:1352
+#: ../calendar/gui/e-calendar-view.c:1349
 msgid "Moving items"
 msgstr "항목을 옮기는 중입니다"
 
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1351
 msgid "Copying items"
 msgstr "항목을 복사하는 중입니다"
 
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New _Appointment..."
 msgstr "새 약속(_A)..."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1661
 msgid "New All Day _Event"
 msgstr "새 하루 종일 행사(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1662
 msgid "New _Meeting"
 msgstr "새 모임(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "_Current View"
 msgstr "현재 뷰(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1675
 msgid "Select T_oday"
 msgstr "오늘 선택(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1676
 msgid "_Select Date..."
 msgstr "날짜 선택(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Pri_nt..."
 msgstr "인쇄(_N)..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "Cop_y to Calendar..."
 msgstr "달력으로 복사(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Mo_ve to Calendar..."
 msgstr "달력으로 이동(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Delegate Meeting..."
 msgstr "모임 대리(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "_Schedule Meeting..."
 msgstr "모임 일정(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar로 전달(_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1697
 msgid "_Reply"
 msgstr "회신(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
+#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "전체에 회신(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-calendar-view.c:1703
 msgid "Make this Occurrence _Movable"
 msgstr "이 경우 옮길 수 있게 만들기(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1707 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "이 경우 지우기(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1705
 msgid "Delete _All Occurrences"
 msgstr "모든 경우 지우기(_A)"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2208
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "주최자: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2212
-#, c-format
-msgid "Organizer: %s"
-msgstr "주최자: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2477
 #, c-format
 msgid "Location: %s"
 msgstr "위치: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "시간: %s %s"
@@ -7266,7 +7690,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:807
+#: ../calendar/gui/e-day-view-time-item.c:589
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i분 단위"
@@ -7277,45 +7701,33 @@ msgstr "%02i분 단위"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1359
-#: ../calendar/gui/e-day-view.c:2145
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
 msgid "%A %d %B"
 msgstr "%B %e일 %A"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-day-view.c:1123
-#: ../calendar/gui/e-week-view.c:511 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
+#: ../calendar/gui/print.c:813
 msgid "am"
 msgstr "오전"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:773 ../calendar/gui/e-day-view.c:1126
-#: ../calendar/gui/e-week-view.c:514 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
+#: ../calendar/gui/print.c:815
 msgid "pm"
 msgstr "오후"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "예. (복잡한 반복)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "%d일마다"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
@@ -7323,9 +7735,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "%d주일마다"
 
 # FIXME - hard to translate UI + string based on English grammar
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7333,51 +7743,35 @@ msgstr[0] "%d주일마다 "
 
 # FIXME - hard to translate UI + string based on English grammar
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " 그리고 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "%s "
 
 # FIXME - hard to translate UI + string based on English grammar
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s, "
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "%d달마다"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "%d년마다"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7385,48 +7779,48 @@ msgstr[0] " 전체 %d번"
 
 # FIXME - hard to translate UI + string based on English grammar
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", 끝: "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "시작"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "끝"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "기한"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "iCalendar 정보"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "iCalendar 오류"
 
-#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
-#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:521
+#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "모르는 사람"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1126
+#: ../calendar/gui/e-itip-control.c:1143
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7434,295 +7828,296 @@ msgstr ""
 "<br> 다음 정보를 다시 확인하시고, 아래의 메뉴에서 어떤 동작을 할 지 선택하십"
 "시오."
 
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/itip-utils.c:728
-#: ../plugins/itip-formatter/itip-formatter.c:2034
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/itip-utils.c:664
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "수락"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "잠정적으로 수락"
 
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
-#: ../plugins/itip-formatter/itip-formatter.c:2040
+#: ../calendar/gui/e-itip-control.c:1199
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "거부"
 
-#: ../calendar/gui/e-itip-control.c:1266
+#: ../calendar/gui/e-itip-control.c:1283
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "모임이 취소되었지만, 이 모임이 달력에 들어 있지 않습니다."
 
-#: ../calendar/gui/e-itip-control.c:1268
+#: ../calendar/gui/e-itip-control.c:1285
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "작업이 취소되었지만, 이 작업이 작업 목록에 들어 있지 않습니다."
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>님이 모임 정보를 게시했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "모임 정보"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1370
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b>님이 모임에 %s님의 참석을 요청했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1355
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b>님이 모임에 참석하시기를 요청했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "모임 제안"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b>님이 기존 모임에 들어가고 싶어합니다."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "모임 업데이트"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b>님이 가장 최근의 모임 정보를 받고 싶어합니다."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "모임 업데이트 요청"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b>님이 모임 요청에 회신했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "모임 회신"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b>님이 모임을 취소했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "모임 취소"
 
-#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1528
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b>님이 이해하기 어려운 메세지를 보냈습니다."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "잘못된 모임 메세지"
 
-#: ../calendar/gui/e-itip-control.c:1422
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b>님이 작업 정보를 게시했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "작업 정보"
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1447
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b>님이 %s님에게 작업을 수행하길 요청하셨습니다."
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b>님이 작업을 수행하길 요청하셨습니다."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "작업 제안"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b>님이 기존 작업에 들어가고 싶어합니다."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "작업 업데이트"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b>님이 가장 최근의 작업 정보를 받고 싶어합니다."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "작업 업데이트 요청"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b>님이 작업 할당에 회신했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "작업 회신"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b>님이 작업을 취소했습니다."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "작업 취소"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "잘못된 작업 메세지"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:1496
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b>이(가) 약속 있음/없음 정보를 게시했습니다."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "약속 있음/없음 정보"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:1501
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b>이(가) 약속 있음/없음 정보를 요청했습니다."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "약속 있음/없음 요청"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b>이(가) 약속 있음/없음 요청에 회신했습니다."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "약속 있음/없음 회신"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "틀린 약속 있음/없음 메세지"
 
-#: ../calendar/gui/e-itip-control.c:1588
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message does not appear to be properly formed"
 msgstr "메세지의 형식이 올바르지 않은 것으로 보입니다"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "이 메세지에는 지원하지 않는 요청만 들어 있습니다."
 
-#: ../calendar/gui/e-itip-control.c:1680
+#: ../calendar/gui/e-itip-control.c:1697
 msgid "The attachment does not contain a valid calendar message"
 msgstr "첨부에 올바른 달력 메세지가 없습니다"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "이 첨부를 볼 수 있는 달력 아이템이 없습니다"
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "업데이트 마침\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "오브젝트가 잘못되었고 업데이트할 수 없습니다\n"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "현재 참석자가 아닌 사람이 이 회신을 했습니다. 참석자로 더하시겠습니까?"
+msgstr ""
+"현재 참석자가 아닌 사람이 이 회신을 했습니다. 참석자로 추가하시겠습니까?"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "잘못된 상태때문에 참석자 상태를 업데이트할 수 없습니다!\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "참석자의 상태 업데이트되었습니다\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1254
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "이 항목이 더 이상 없기 때문에 참석자 상태를 업데이트할 수 없습니다"
 
-#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "항목을 보냈습니다!\n"
 
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "항목을 보낼 수 없습니다!\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "동작을 고르십시오:"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "업데이트"
 
-#: ../calendar/gui/e-itip-control.c:2332
+#: ../calendar/gui/e-itip-control.c:2355
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "수락"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "잠정적으로 수락"
 
-#: ../calendar/gui/e-itip-control.c:2334
+#: ../calendar/gui/e-itip-control.c:2357
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "거부"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "약속 있음/없음 정보 보내기"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "업데이트 응답 상태"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "가장 최근 정보 보내기"
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "취소"
@@ -7753,112 +8148,112 @@ msgstr "달력 불러오기..."
 msgid "Server Message:"
 msgstr "서버 메세지:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "의장"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "필수 참석자"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "선택 참석자"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "자원"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "참석자"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:965
 msgid "Individual"
 msgstr "개인"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
 #: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "그룹"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
 #: ../calendar/gui/print.c:967
 msgid "Resource"
 msgstr "자원"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
 #: ../calendar/gui/print.c:968
 msgid "Room"
 msgstr "방"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
 #: ../calendar/gui/print.c:982
 msgid "Chair"
 msgstr "의장"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/e-meeting-store.c:746 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:983
 msgid "Required Participant"
 msgstr "필수 참석자"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
 #: ../calendar/gui/print.c:984
 msgid "Optional Participant"
 msgstr "선택 참석자"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
 #: ../calendar/gui/print.c:985
 msgid "Non-Participant"
 msgstr "불참자"
 
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:756
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:753
 msgid "Needs Action"
 msgstr "동작 필요"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Tentative"
 msgstr "잠정적"
 
-#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/itip-utils.c:737
-#: ../plugins/itip-formatter/itip-formatter.c:2043
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/itip-utils.c:673
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "대리"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:484
+#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr "참석자"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../calendar/gui/e-meeting-list-view.c:533
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "응답바람"
 
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
 msgstr "진행중"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:473
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%Y년 %B %e일 %A"
 
@@ -7866,87 +8261,83 @@ msgstr "%Y년 %B %e일 %A"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:481
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "부재 중"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "정보 없음"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "참석자(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "옵션(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "근무 시간만 보기(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "축소해서 보기(_Z)"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "약속 있음/없음 업데이트(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
 # Autopick -> 빈 시간 찾기, Microsoft Office XP 참고
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "빈 시간 찾기(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "모든 사람과 자원(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "모든 사람과 자원 한 개(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "필요한 사람(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "필요한 사람과 자원 한 개(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "시작 시각(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "마침 시각(_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "참석자"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "참석자를 추가하려면 여기를 누르십시오"
@@ -7979,8 +8370,8 @@ msgstr "선택한 메모 지우기(_D)"
 msgid "Click to add a memo"
 msgstr "메모를 추가하려면 누르십시오"
 
-#: ../calendar/gui/e-memos.c:791 ../calendar/gui/e-tasks.c:923
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/gnome-cal.c:2864
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7989,85 +8380,84 @@ msgstr ""
 "%s에서 오류 발생:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:840
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "메모를 읽어들이는 중입니다"
 
-#: ../calendar/gui/e-memos.c:921
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s에 있는 메모를 여는 중입니다"
 
-#: ../calendar/gui/e-memos.c:1094 ../calendar/gui/e-tasks.c:1334
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "선택한 오브젝트를 지웁니다..."
 
-#: ../calendar/gui/e-tasks.c:976
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "작업을 읽어들이는 중입니다"
 
-#: ../calendar/gui/e-tasks.c:1066
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s에 있는 작업을 여는 중입니다"
 
-#: ../calendar/gui/e-tasks.c:1311
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "작업을 완료하는 중입니다..."
 
-#: ../calendar/gui/e-tasks.c:1361
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "지운 메세지 비우는 중"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:130
 msgid "Select Timezone"
 msgstr "시간대를 선택하십시오"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1637
 msgid "%d %B"
 msgstr "%B %e일"
 
-#: ../calendar/gui/gnome-cal.c:828
+#: ../calendar/gui/gnome-cal.c:830
 msgid "Updating query"
 msgstr "질의를 업데이트하는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2501
 msgid "_Custom View"
 msgstr "사용자 설정 보기(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2502
 msgid "_Save Custom View"
 msgstr "사용자 설정 보기 저장(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2507
 msgid "_Define Views..."
 msgstr "보기 지정(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2688
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s의 약속을 읽어들이는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2707
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s의 작업을 읽어들이는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2716
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s에서 메모를 읽어들이는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2823
 #, c-format
 msgid "Opening %s"
 msgstr "%s 여는 중입니다"
 
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3779
 msgid "Purging"
 msgstr "비우는 중"
 
@@ -8127,139 +8517,143 @@ msgstr "9월"
 msgid "_Select Today"
 msgstr "오늘 선택(_S)"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../calendar/gui/itip-utils.c:544
 msgid "An organizer must be set."
 msgstr "주최자를 결정해야 합니다."
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "참석자가 최소한 한 사람은 필요합니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "행사 정보"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "작업 정보"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "메모 정보"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "약속 있음/없음 정보"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "달력 정보"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "업데이트됨"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "새로 고침"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "반대-제안"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "약속 있음/없음 정보 (%s부터 %s까지)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iCalendar 정보"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "이 행사의 참석자여야 합니다."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:465
 msgid "_New Memo List"
 msgstr "새 메모 목록(_N)"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:545
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d개 메모"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d개 선택"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:594
 msgid "Failed upgrading memos."
 msgstr "메모를 업그레이드하는 데 실패했습니다."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:954
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "행사와 모임을 만드는 데 쓸 '%s' 메모 목록을 열 수 없습니다"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:967
 msgid "There is no calendar available for creating memos"
 msgstr "메모를 만들 때 쓸 수 있는 달력이 없습니다"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1077
 msgid "Memo Source Selector"
 msgstr "메모 소스 선택"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "새 메모"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
 msgid "Mem_o"
 msgstr "메모(_O)"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "새 메모를 만듭니다"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "새 공유 메모"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
 msgid "_Shared memo"
 msgstr "공유 메모(_S)"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "새 공유 메모를 만듭니다"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "새 메모 목록"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
 msgid "Memo li_st"
 msgstr "메모 목록(_S)"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "새 메모 목록을 만듭니다"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
 msgid "Print Memos"
 msgstr "메모 인쇄"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days'"
+msgstr "앞으로 7일"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8270,7 +8664,7 @@ msgstr ""
 "\n"
 "폴더를 옮기는 동안 잠시 기다리십시오..."
 
-#: ../calendar/gui/migration.c:168
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8282,27 +8676,27 @@ msgstr ""
 "폴더를 옮기는 동안 잠시 기다리십시오..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:781 ../calendar/gui/migration.c:949
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "evolution/config.xmldb의 과거 설정을 옮겨 올 수 없습니다"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:810
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "`%s' 달력을 옮겨 올 수 없습니다"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:978
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "`%s' 작업을 옮겨 올 수 없습니다"
 
 #: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
 msgid "Notes"
 msgstr "쪽지"
 
@@ -8510,67 +8904,67 @@ msgstr "연락처:"
 msgid "Upcoming Appointments"
 msgstr "예정된 약속"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:456
 msgid "_New Task List"
 msgstr "새 작업 목록(_N)"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:536
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "연락처 %d개"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:585
 msgid "Failed upgrading tasks."
 msgstr "작업을 업그레이드하는 데 실패했습니다."
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:942
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "행사와 모임을 만드는 데 쓸 '%s' 작업 목록을 열 수 없습니다"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:955
 msgid "There is no calendar available for creating tasks"
 msgstr "작업을 만들 때 쓸 수 있는 달력이 없습니다"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1066
 msgid "Task Source Selector"
 msgstr "작업 소스 선택"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "새 작업"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "새 작업을 만듭니다"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "새로 할당한 작업"
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1334
 msgid "Assigne_d Task"
 msgstr "할당한 작업(_D)"
 
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "새로 할당한 작업을 만듭니다"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "새 작업 목록"
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1342
 msgid "Tas_k list"
 msgstr "작업 목록(_K)"
 
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "새 작업 목록을 만듭니다"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../calendar/gui/tasks-control.c:452
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8582,53 +8976,76 @@ msgstr ""
 "\n"
 "정말로 이 작업들을 지우시겠습니까?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "다시 묻지 않습니다."
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "작업 인쇄"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% 완료"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "취소함"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "진행 중"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "보다 큼"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "보다 적음"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "약속 및 모임"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1580
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1578
 msgid "Opening calendar"
 msgstr "달력을 여는 중입니다"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 파일 (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
-msgstr "에볼루션 iCalendar 가져오기 프로그램"
+msgstr "에볼루션 iCalendar 가져오기"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "미리 알림!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar 파일 (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
-msgstr "에볼루션 vCalendar 가져오기 프로그램"
+msgstr "에볼루션 vCalendar 가져오기"
 
 # event -> 행사, Microsoft Office XP 참고
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "달력 행사"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
-msgstr "에볼루션 달력 똑똑한 가져오기 프로그램"
+msgstr "에볼루션 달력 똑똑한 가져오기"
 
 #.
 #. * These are the timezone names from the Olson timezone data.
@@ -10162,58 +10579,214 @@ msgstr "태평양/월리스"
 msgid "Pacific/Yap"
 msgstr "태평양/얍"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "주소록을 보려면 누르십시오"
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "자동 저장 파일을 열 수 없습니다"
 
-# post -> 게시, Microsoft Office XP 참고
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "게시물 수신자"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "편집기에서 메세지를 가져올 수 없습니다"
 
-# post -> 게시, Microsoft Office XP 참고
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "메세지를 올릴 폴더를 선택하십시오."
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "첨부 넣기"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "게시할 폴더를 고를려면 여기를 누르십시오"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "첨부(_T)"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "서명(_G):"
+#: ../composer/e-composer-actions.c:143
+msgid "Untitled Message"
+msgstr "제목 없는 메세지"
 
-#: ../composer/e-msg-composer-hdrs.c:326
-msgid "Fr_om:"
-msgstr "보낸 사람(_O):"
+#: ../composer/e-composer-actions.c:474
+msgid "Attach a file"
+msgstr "파일을 첨부합니다"
 
-#: ../composer/e-msg-composer-hdrs.c:332
-msgid "_Reply-To:"
-msgstr "회신 주소(_R):"
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "닫기(_C)"
 
-#: ../composer/e-msg-composer-hdrs.c:335
-msgid "_To:"
-msgstr "받는 사람(_T):"
+#: ../composer/e-composer-actions.c:481
+msgid "Close the current file"
+msgstr "현재 파일을 닫습니다"
 
-#: ../composer/e-msg-composer-hdrs.c:337
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "인쇄(_P)..."
+
+#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "인쇄 미리 보기(_V)"
+
+#: ../composer/e-composer-actions.c:502
+msgid "Save the current file"
+msgstr "현재 파일을 저장합니다"
+
+#: ../composer/e-composer-actions.c:507
+msgid "Save _As..."
+msgstr "다른 이름으로 저장(_A)..."
+
+#: ../composer/e-composer-actions.c:509
+msgid "Save the current file with a different name"
+msgstr "현재 파일을 다른 이름으로 저장합니다"
+
+#: ../composer/e-composer-actions.c:514
+msgid "Save _Draft"
+msgstr "임시 보관함에 저장(_D)"
+
+#: ../composer/e-composer-actions.c:516
+msgid "Save as draft"
+msgstr "임시 보관함에 저장"
+
+#: ../composer/e-composer-actions.c:521
+msgid "S_end"
+msgstr "보내기(_E)"
+
+#: ../composer/e-composer-actions.c:523
+msgid "Send this message"
+msgstr "이 메세지를 지금 보냅니다"
+
+#: ../composer/e-composer-actions.c:530
+msgid "Insert Send options"
+msgstr "보내기 옵션 넣기"
+
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "새 메세지(_M)"
+
+#: ../composer/e-composer-actions.c:537
+msgid "Open New Message window"
+msgstr "새 메세지 창을 엽니다"
+
+#: ../composer/e-composer-actions.c:544
+msgid "Character _Encoding"
+msgstr "문자 인코딩(_E)"
+
+#: ../composer/e-composer-actions.c:551
+msgid "_Security"
+msgstr "보안(_S)"
+
+#: ../composer/e-composer-actions.c:561
+msgid "PGP _Encrypt"
+msgstr "PGP 암호화(_E)"
+
+#: ../composer/e-composer-actions.c:563
+msgid "Encrypt this message with PGP"
+msgstr "이 메세지를 PGP로 암호화합니다"
+
+#: ../composer/e-composer-actions.c:569
+msgid "PGP _Sign"
+msgstr "PGP 서명(_S)"
+
+#: ../composer/e-composer-actions.c:571
+msgid "Sign this message with your PGP key"
+msgstr "이 메세지를 PGP키로 서명합니다"
+
+#: ../composer/e-composer-actions.c:577
+msgid "_Prioritize Message"
+msgstr "메세지 우선순위 높이기(_P)"
+
+#: ../composer/e-composer-actions.c:579
+msgid "Set the message priority to high"
+msgstr "메세지 우선순위를 높입니다"
+
+# read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
+#: ../composer/e-composer-actions.c:585
+msgid "Re_quest Read Receipt"
+msgstr "내용 읽음 확인 요청(_Q)"
+
+#: ../composer/e-composer-actions.c:587
+msgid "Get delivery notification when your message is read"
+msgstr "메세지를 읽으면 배달 확인 받기"
+
+#: ../composer/e-composer-actions.c:593
+msgid "S/MIME En_crypt"
+msgstr "S/MIME 암호화(_C)"
+
+#: ../composer/e-composer-actions.c:595
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "이 메세지를 S/MIME 암호화 인증서로 암호화합니다"
+
+#: ../composer/e-composer-actions.c:601
+msgid "S/MIME Sig_n"
+msgstr "S/MIME 서명(_N)"
+
+#: ../composer/e-composer-actions.c:603
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "이 메세지를 S/MIME 서명 증명으로 서명합니다"
+
+#: ../composer/e-composer-actions.c:609
+msgid "_Bcc Field"
+msgstr "숨은 참조 항목(_B)"
+
+#: ../composer/e-composer-actions.c:611
+msgid "Toggles whether the BCC field is displayed"
+msgstr "숨은 참조 항목을 표시할 지 토글합니다"
+
+#: ../composer/e-composer-actions.c:617
+msgid "_Cc Field"
+msgstr "참조 항목(_C)"
+
+#: ../composer/e-composer-actions.c:619
+msgid "Toggles whether the CC field is displayed"
+msgstr "참조 항목을 표시할 지 토글합니다"
+
+#: ../composer/e-composer-actions.c:625
+msgid "_From Field"
+msgstr "발신 항목(_F)"
+
+#: ../composer/e-composer-actions.c:627
+msgid "Toggles whether the From chooser is displayed"
+msgstr "발신 항목을 표시할 지 토글합니다"
+
+#: ../composer/e-composer-actions.c:633
+msgid "_Post-To Field"
+msgstr "올리는 곳 항목(_P)"
+
+#: ../composer/e-composer-actions.c:635
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "올리는 곳 항목을 표시할 지 토글합니다"
+
+#: ../composer/e-composer-actions.c:641
+msgid "_Reply-To Field"
+msgstr "회신 주소 항목(_R)"
+
+#: ../composer/e-composer-actions.c:643
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "회신 주소 항목을 표시할 지 토글합니다"
+
+#: ../composer/e-composer-actions.c:649
+msgid "_Subject Field"
+msgstr "제목 항목(_S)"
+
+#: ../composer/e-composer-actions.c:651
+msgid "Toggles whether the Subject field is displayed"
+msgstr "제목 항목을 표시할 지 토글합니다"
+
+#: ../composer/e-composer-actions.c:657
+msgid "_To Field"
+msgstr "받는 사람 항목(_T)"
+
+#: ../composer/e-composer-actions.c:659
+msgid "Toggles whether the To field is displayed"
+msgstr "받는 사람 항목을 표시할 지 토글합니다"
+
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "메세지를 받을 사람을 입력하십시오"
 
-#: ../composer/e-msg-composer-hdrs.c:340
-msgid "_Cc:"
-msgstr "참조(_C):"
-
-#: ../composer/e-msg-composer-hdrs.c:342
+#: ../composer/e-composer-header-table.c:68
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "메세지의 사본을 받을 사람의 주소를 입력하십시오"
 
-#: ../composer/e-msg-composer-hdrs.c:346
-msgid "_Bcc:"
-msgstr "숨은 참조(_B):"
-
-#: ../composer/e-msg-composer-hdrs.c:348
+#: ../composer/e-composer-header-table.c:71
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10221,31 +10794,73 @@ msgstr ""
 "메세지의 받는 사람 목록에 나타나지 않고 참조 메세지를 받을 주소를 입력하십시"
 "오."
 
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr "보낸 사람(_O):"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr "회신 주소(_R):"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "받는 사람(_T):"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "참조(_C):"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "숨은 참조(_B):"
+
 # post -> 게시, Microsoft Office XP 참고
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "게시 위치(_P):"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "제목(_U):"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "첨부(_T)"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "서명(_G):"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "첨부 넣기"
+#: ../composer/e-composer-name-header.c:114
+msgid "Click here for the address book"
+msgstr "주소록을 보려면 누르십시오"
+
+# post -> 게시, Microsoft Office XP 참고
+#: ../composer/e-composer-post-header.c:136
+msgid "Posting destination"
+msgstr "게시물 수신자"
+
+# post -> 게시, Microsoft Office XP 참고
+#: ../composer/e-composer-post-header.c:137
+msgid "Choose folders to post the message to."
+msgstr "메세지를 올릴 폴더를 선택하십시오."
 
-#: ../composer/e-msg-composer.c:819
+#: ../composer/e-composer-post-header.c:171
+msgid "Click here to select folders to post to"
+msgstr "게시할 폴더를 고를려면 여기를 누르십시오"
+
+#: ../composer/e-composer-private.c:65
+msgid "Recent _Documents"
+msgstr "최근 문서(_D)"
+
+#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+msgid "Show _Attachment Bar"
+msgstr "첨부 모음 보기(_A)"
+
+#: ../composer/e-msg-composer.c:873
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "보내는 메세지에 서명할 수 없습니다: 계정에 사인할 때 쓸 인증서를 설정하지 않"
 "았습니다"
 
-#: ../composer/e-msg-composer.c:826
+#: ../composer/e-msg-composer.c:880
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10253,42 +10868,22 @@ msgstr ""
 "보내는 메세지를 암호화할 수 없습니다: 계정에서 암호화 인증서를 설정하지 않았"
 "습니다"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
+#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1914
+#: ../mail/em-format-html-display.c:2404 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "첨부"
+
+#: ../composer/e-msg-composer.c:1557
 msgid "Hide _Attachment Bar"
 msgstr "첨부 모음 숨기기(_A)"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3878
-msgid "Show _Attachment Bar"
-msgstr "첨부 모음 보기(_A)"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "알 수 없는 이유"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "파일을 열 수 없습니다"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "편집기에서 메세지를 가져올 수 없습니다"
-
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
-msgstr "제목 없는 메세지"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "파일 열기"
-
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3758
-#: ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
 msgid "Compose Message"
 msgstr "메세지를 작성합니다"
 
-#: ../composer/e-msg-composer.c:5031
+#: ../composer/e-msg-composer.c:4056
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10318,8 +10913,7 @@ msgstr "정말로 제목이 '{0}'인, 작성중이었던 메세지를 버리시�
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "&quot;{0}&quot; 때문에, 다른 메일 옵션을 선택해야 할 수도 있습니다."
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "&quot;{1}&quot; 때문입니다."
 
@@ -10437,7 +11031,7 @@ msgstr "메일을 작성하기 전에 계정을 설정해야 합니다."
 msgid "_Do not Recover"
 msgstr "복구하지 않음(_D)"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:312
+#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:306
 msgid "_Recover"
 msgstr "복구(_R)"
 
@@ -10449,7 +11043,7 @@ msgstr "메세지 저장(_S)"
 msgid "Evolution Mail and Calendar"
 msgstr "에볼루션 메일 및 달력"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:672
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "그룹웨어 모음"
 
@@ -10465,56 +11059,79 @@ msgstr "주소 카드"
 msgid "calendar information"
 msgstr "달력 정보"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "에볼루션 오류"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "에볼루션 경고"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "에볼루션 정보"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "에볼루션 물음"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "내부 오류, 알 수 없는 '%s' 오류가 발생했습니다"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:154
+msgid "Component"
+msgstr "컴포넌트"
+
+#: ../e-util/e-logger.c:155
+msgid "Name of the component being logged"
+msgstr "기록 중인 컴포넌트의 이름"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../plugins/plugin-manager/plugin-manager.c:339
+#: ../plugins/publish-calendar/publish-calendar.c:689
+msgid "Enabled"
+msgstr "사용"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "플러그인을 사용하는 지 여부"
+
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "인쇄하는 도중 오류가 발생했습니다"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "인쇄 시스템에서 다음과 같은 오류가 보고되었습니다:"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:171
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "인쇄 시스템에서 추가 오류 내용을 자세히 보고하지 않았습니다."
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "\"{1}\" 때문입니다."
+
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 파일을 열 수 없습니다."
+msgid "Cannot open file \"{0}\"."
+msgstr "\"{0}\" 파일을 열 수 없습니다."
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 파일을 저장할 수 없습니다."
+msgid "Cannot save file \"{0}\"."
+msgstr "\"{0}\" 파일을 저장할 수 없습니다."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "덮어 쓰시겠습니까?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 파일이 있습니다."
+msgid "File exists \"{0}\"."
+msgstr "\"{0}\" 파일이 있습니다."
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
@@ -10524,49 +11141,60 @@ msgstr "파일을 덮어쓰시겠습니까?"
 msgid "_Overwrite"
 msgstr "덮어 쓰기(_O)"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "중요(_M)"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "업무(_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "개인(_P)"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "할 일(_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "나중에(_L)"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "레이블 이름(_N):"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "레이블 편집"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "레이블 추가"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "레이블 이름이 빈 문자열이면 안 됩니다."
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
-msgstr "같은 태그의 레이블이 이미 있습니다. 레이블 이름을 바꾸십시오."
+#: ../e-util/e-util-labels.c:356
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
+msgstr "같은 태그의 레이블이 이미 서버에 있습니다. 레이블 이름을 바꾸십시오."
+
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf 오류: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "나머지 오류 메세지는 터미널에서만 표시합니다."
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -10670,65 +11298,65 @@ msgstr "%Y-%m-%d"
 msgid "Select a time to compare against"
 msgstr "비교할 시각을 선택하십시오"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "파일을 선택하십시오"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "테스트"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:851
 msgid "R_ule name:"
 msgstr "규칙 이름(_U):"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:879
 msgid "Find items that meet the following criteria"
 msgstr "다음 조건이 만족한 항목을 찾습니다"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:913
 msgid "A_dd Filter Criteria"
 msgstr "필터 조건 추가(_D)"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:919
 msgid "If all criteria are met"
 msgstr "모든 조건이 다 충족될 때"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:919
 msgid "If any criteria are met"
 msgstr "어떤 조건이라도 충족될 때"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:921
 msgid "_Find items:"
 msgstr "항목 찾기(_F):"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "All related"
 msgstr "관계된 모두"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "Replies"
 msgstr "답장"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "Replies and parents"
 msgstr "답장 및 그 상위 메일"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:943
 msgid "No reply or parent"
 msgstr "답장 없거나 상위 메일 없음"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:945
 msgid "I_nclude threads"
 msgstr "글타래 포함(_N)"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1043 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "받는 메일"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1043 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "보내는 메일"
 
@@ -10752,7 +11380,7 @@ msgstr "날짜가 빠졌습니다."
 msgid "Missing file name."
 msgstr "파일 이름이 빠졌습니다."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "이름이 빠졌습니다."
 
@@ -10828,7 +11456,7 @@ msgstr "앞으로"
 msgid "months"
 msgstr "달"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "초"
 
@@ -10840,9 +11468,9 @@ msgstr "현재 시각"
 msgid "the time you specify"
 msgstr "지정하는 시각"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:404
 msgid "weeks"
 msgstr "주"
 
@@ -10858,7 +11486,7 @@ msgstr "규칙 추가"
 msgid "Edit Rule"
 msgstr "규칙 편집"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "규칙 이름"
 
@@ -10877,60 +11505,72 @@ msgstr "여기서 맞춤법 검사, 서명, 그리고 메세지 작성 설정을
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
-msgstr "여기서 전자메일 게정을 설정합니다"
+msgstr "여기서 전자메일 계정을 설정합니다"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "여기서 네트워크 연결을 설정합니다"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "에볼루션 메일"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr "에볼루션 메일 계정 설정 컨트롤"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "에볼루션 메일 컴포넌트"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "에볼루션 메일 작성"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr "에볼루션 메일 작성 설정 컨트롤"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "에볼루션 메일 기본 설정 컨트롤"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:575 ../mail/mail-component.c:576
-#: ../mail/mail-component.c:740
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Network configuration control"
+msgstr "에볼루션 네트워크 설정 컨트롤"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../mail/mail-component.c:593 ../mail/mail-component.c:594
+#: ../mail/mail-component.c:758
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "메일"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:502
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "메일 계정"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:102
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "메일 기본 설정"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "네트워크 기본 설정"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "메일(_M)"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s 사용 약관"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10942,117 +11582,111 @@ msgstr ""
 "아래에 있는 %s의 사용 약관을 잘 읽어 보시고\n"
 "동의하실 경우 체크 단추에 체크하십시오.\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "폴더 선택"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:97
 msgid "Autogenerated"
 msgstr "자동으로 만들기"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "메세지마다 물어보기"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "신상 정보"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "메일 받기"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2041
 msgid "Check for _new messages every"
 msgstr "새 메일 확인(_N), 매"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2049
 msgid "minu_tes"
 msgstr "분(_T)"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "메일 보내기"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2282 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "기본값"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "보안"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2385 ../mail/em-account-editor.c:2476
 msgid "Receiving Options"
 msgstr "받기 옵션"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2386 ../mail/em-account-editor.c:2477
 msgid "Checking for New Messages"
 msgstr "새 메일 확인"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "계정 편집기"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "에볼루션 계정 도우미"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[기본값]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "사용"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "계정 이름"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "프로토콜"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "이름없음"
 
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "언어"
 
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "서명 스크립트 추가"
 
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "서명"
 
 # 번역은 적합하지 않다.
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "알 수 없는 보낸 이"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1750
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11061,11 +11695,11 @@ msgstr ""
 "${TimeZone}, ${Sender} 쓰시길:"
 
 # 번역은 적합하지 않다.
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "필터 규칙(_F)"
 
@@ -11082,10 +11716,6 @@ msgstr "색 지정"
 msgid "Assign Score"
 msgstr "점수 지정"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "첨부"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "숨긴 참조"
@@ -11103,11 +11733,6 @@ msgstr "참조"
 msgid "Completed On"
 msgstr "완료 날짜"
 
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "포함"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "폴더로 복사"
@@ -11121,7 +11746,7 @@ msgid "Date sent"
 msgstr "보낸 날짜"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11133,11 +11758,6 @@ msgid "Deleted"
 msgstr "지워짐"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "포함하지 않음"
-
-# FIXME - hard to translate UI + string based on English grammar
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "끝나지 않음"
@@ -11162,10 +11782,6 @@ msgstr "비슷한 소리 아님"
 msgid "does not start with"
 msgstr "시작하지 않음"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "존재하지 않음"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "임시 보관함"
@@ -11175,10 +11791,6 @@ msgstr "임시 보관함"
 msgid "ends with"
 msgstr "끝남"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "존재함"
-
 # FIXME - hard to translate UI + string based on English grammar
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
@@ -11192,16 +11804,11 @@ msgstr "표현"
 msgid "Follow Up"
 msgstr "추가 작업"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "중요"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "같음"
-
-# FIXME - hard to translate UI + string based on English grammar
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "뒤 날짜"
@@ -11217,21 +11824,6 @@ msgid "is Flagged"
 msgstr "플래그 지정"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "보다 큼"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "보다 적음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "다름"
-
-# FIXME - hard to translate UI + string based on English grammar
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "플래그 지정 아님"
@@ -11246,7 +11838,7 @@ msgstr "설정 아님"
 msgid "is set"
 msgstr "설정"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "정크메일"
@@ -11255,7 +11847,7 @@ msgstr "정크메일"
 msgid "Junk Test"
 msgstr "정크메일 테스트"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "레이블"
 
@@ -11297,7 +11889,7 @@ msgstr "사운드 재생"
 
 #. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "읽음"
 
@@ -11374,10 +11966,9 @@ msgstr "시작함"
 msgid "Stop Processing"
 msgstr "처리 중지"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:318
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11388,11 +11979,11 @@ msgid "Unset Status"
 msgstr "상태 설정 없애기"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "그러면"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "동작 추가(_T)"
 
@@ -11436,46 +12027,51 @@ msgstr "중요한 메세지"
 msgid "Messages Not Junk"
 msgstr "정크메일 아닌 메세지"
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "계정 찾기"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "모든 계정 찾기"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:173
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "읽지 않은 메세지:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:177
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "전체 메세지:"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+msgid "Quota usage"
+msgstr "용량 제한 사용"
+
+#: ../mail/em-folder-properties.c:385
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "폴더 속성"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<폴더를 고를려면 여기를 누르십시오>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "만들기(_R)"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "폴더 이름(_N):"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "찾기 폴더"
 
@@ -11485,27 +12081,27 @@ msgstr "찾기 폴더"
 msgid "UNMATCHED"
 msgstr "해당 없음"
 
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "임시 보관함"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
-#: ../mail/mail-component.c:156
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
+#: ../mail/em-folder-tree-model.c:507 ../mail/em-folder-tree.c:2556
+#: ../mail/mail-component.c:160
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
 msgid "Inbox"
 msgstr "받은 편지함"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "보낼 편지함"
 
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "보낸 편지함"
 
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "읽어들이는 중..."
 
@@ -11524,86 +12120,78 @@ msgstr "읽어들이는 중..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:372
+#: ../mail/em-folder-tree.c:380
 #, c-format
 msgid "folder-display|%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "메일 폴더 트리"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s 폴더를 옮기는 중"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s 폴더를 복사하는 중"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "메시지를 %s 폴더로 옮기는 중입니다"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "메시지를 %s 폴더로 복사하는 중입니다"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "메세지를 맨 위의 저장고에 넣을 수 없습니다"
 
-#: ../mail/em-folder-tree.c:1011 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "폴더로 복사(_C)"
 
-#: ../mail/em-folder-tree.c:1012 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "폴더로 이동(_M)"
 
-#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\"의 폴더를 찾는 중"
 
-#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "보기(_V)"
-
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "새 창에서 열기(_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "새 폴더(_N)..."
 
-#: ../mail/em-folder-tree.c:2103
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "이동(_M)..."
 
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "이름 바꾸기(_R)..."
 
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "새로 고침(_F)"
 
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "보낼 편지함 비우기(_U)"
 
-#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "휴지통 비우기(_E)"
 
@@ -11612,13 +12200,13 @@ msgstr "휴지통 비우기(_E)"
 msgid "Copying `%s' to `%s'"
 msgstr "`%s'에서 `%s' 폴더로 복사하는 중"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "폴더 선택"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
 msgid "C_opy"
 msgstr "복사(_O)"
 
@@ -11640,207 +12228,199 @@ msgstr "폴더를 만듭니다"
 msgid "Specify where to create the folder:"
 msgstr "폴더 만들 곳을 지정하십시오:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "메일 지우기가 실패했습니다"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "이 메일을 지울 권한이 없습니다."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "보낸 사람에게 회신(_R)"
 
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:578 ../mail/em-popup.c:589
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "전달(_F)"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "새 메세지로 편집(_E)..."
 
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "인쇄(_P)..."
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1348
 msgid "U_ndelete"
 msgstr "되살리기(_N)"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1349
 msgid "_Move to Folder..."
 msgstr "폴더로 이동(_M)..."
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1350
 msgid "_Copy to Folder..."
 msgstr "폴더로 복사(_C)..."
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1353
 msgid "Mar_k as Read"
 msgstr "읽은 것으로 표시(_K)"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Unread"
 msgstr "읽지 않은 것으로 표시(_U)"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Important"
 msgstr "중요한 것으로 표시(_I)"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as Un_important"
 msgstr "중요하지 않은 것으로 표시(_I)"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Junk"
 msgstr "정크메일로 표시(_J)"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as _Not Junk"
 msgstr "정크메일이 아닌 것으로 표시(_N)"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1359
 msgid "Mark for Follo_w Up..."
 msgstr "추가 작업으로 표시(_W)..."
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1361
 msgid "_Label"
 msgstr "레이블(_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "없음(_N)"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1365
 msgid "_New Label"
 msgstr "새 레이블(_N)"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1369
 msgid "Fla_g Completed"
 msgstr "표시 완료(_G)"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1370
 msgid "Cl_ear Flag"
 msgstr "표시 비우기(_E)"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1373
 msgid "Crea_te Rule From Message"
 msgstr "메시지로부터 규칙 만들기(_T)"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1375
 msgid "Search Folder based on _Subject"
 msgstr "제목에 따른 찾기 폴더(_S)"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1376
 msgid "Search Folder based on Se_nder"
 msgstr "보낸 사람에 따른 찾기 폴더(_N)"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1377
 msgid "Search Folder based on _Recipients"
 msgstr "받은 사람에 따른 찾기 폴더(_R)"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1378
 msgid "Search Folder based on Mailing _List"
 msgstr "메일링 리스트에 대한 찾기 폴더(_L)"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1383
 msgid "Filter based on Sub_ject"
 msgstr "제목에 대한 필터(_J)"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1384
 msgid "Filter based on Sen_der"
 msgstr "보낸 사람에 대한 필터(_D)"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1385
 msgid "Filter based on Re_cipients"
 msgstr "받은 사람에 대한 필터(_C)"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1386
 msgid "Filter based on _Mailing List"
 msgstr "메일링 리스트에 대한 필터(_M)"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
 msgid "Default"
 msgstr "기본값"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "메세지를 가져올 수 없습니다"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "메세지를 가져오는 중..."
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "호출하기(_A)..."
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
 msgstr "찾기 폴더 만들기(_S)"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "이 주소에서(_F)"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "이 주소로(_T)"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "메일을 %s 주소로 보내려면 누르십시오"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "%s에게 호출하려면 누르십시오"
 
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "주소를 감추려면/보이려면 누르십시오"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:472
 #, c-format
 msgid "Matches: %d"
 msgstr "일치: %d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:616
 msgid "Fin_d:"
 msgstr "찾기(_D):"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:640
 msgid "_Previous"
 msgstr "이전(_P)"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:645
 msgid "_Next"
 msgstr "다음(_N)"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:650
 msgid "M_atch case"
 msgstr "대소문자 구별(_A)"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "서명 없음"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11848,11 +12428,11 @@ msgstr ""
 "이 메세지에는 서명이 없습니다.  메세지를 보낸 사람이 확실한 지 보장할 수 없습"
 "니다."
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "올바른 서명"
 
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11860,11 +12440,11 @@ msgstr ""
 "이 메세지는 서명되었고 서명이 올바릅니다.  메세지를 보낸 사람은 그 사람이 거"
 "의 확실합니다."
 
-#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "잘못된 서명"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11872,11 +12452,11 @@ msgstr ""
 "이 메세지의 서명을 확인할 수 없습니다. 메일이 전송중에 변경되었을 수 있습니"
 "다."
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "올바른 서명이지만, 보낸 사람을 확인할 수 없습니다"
 
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11884,21 +12464,21 @@ msgstr ""
 "이 메세지는 올바른 서명으로 사인되었습니다. 하지만 메세지를 보낸 사람을 확인"
 "할 수 없습니다."
 
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "서명이 있지만, 공개키가 필요합니다"
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:953
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "이 메세지는 서명되어 있지만, 서명에 해당하는 공개 키가 없습니다."
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "암호화 안 됨"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11906,11 +12486,11 @@ msgstr ""
 "이 메세지는 암호화하지 않았습니다.  인터넷을 통해 전달되는 동안 다른 사람이 "
 "이 메세지를 봤을 수 있습니다."
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "암호화됨, 약함"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:961
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11920,11 +12500,11 @@ msgstr ""
 "사람이 이 메세지의 내용을 알아 내는 게 어렵긴 하지만, 현실적인 시간 내에 불가"
 "능하지는 않습니다."
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "암호화됨"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:962
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11932,11 +12512,11 @@ msgstr ""
 "메세지가 암호화되어 있습니다.  다른 사람이 이 메세지의 내용을 알아 내기는 어"
 "렵습니다."
 
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "암호화됨, 강력"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:963
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11945,94 +12525,89 @@ msgstr ""
 "메세지가 암호화되어 있지만, 약한 암호화 알고리즘으로 암호화되었습니다.  현실"
 "적인 시간 내에 다른 사람이 이 메세지의 내용을 알아 내는 건 매우 어렵습니다."
 
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1064 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "인증서 보기(_V)"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1079
 msgid "This certificate is not viewable"
 msgstr "이 인증서는 볼 수 없습니다"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1372
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "마침: %Y년 %B %e일, %p %l:%M"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1380
 msgid "Overdue:"
 msgstr "마감 지남:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1383
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y년 %B %e일, %p %l:%M까지"
 
 # FIXME - inline의 나은 번역을 찾아보자
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1461
 msgid "_View Inline"
 msgstr "인라인으로 보기(_V)"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1462
 msgid "_Hide"
 msgstr "숨기기(_H)"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1463
 msgid "_Fit to Width"
 msgstr "너비에 맞추기(_F)"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1464
 msgid "Show _Original Size"
 msgstr "원래 크기로 표시(_O)"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "첨부"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1984
 msgid "Save attachment as"
 msgstr "다른 이름으로 첨부 문서 저장"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1988
 msgid "Select folder to save all attachments"
 msgstr "모든 첨부를 저장할 폴더 선택..."
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2039
 msgid "_Save Selected..."
 msgstr "선택한 것 저장(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2106
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d개 첨부(_T)"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2113 ../mail/em-format-html-display.c:2202
 msgid "S_ave"
 msgstr "저장(_A)"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2124
 msgid "S_ave All"
 msgstr "모두 저장(_A)"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2198
 msgid "No Attachment"
 msgstr "첨부 없음"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2339 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "원본 보기(_U)"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2341
 msgid "Hide _Unformatted"
 msgstr "원본 감추기(_U)"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2396
 msgid "O_pen With"
 msgstr "다른 프로그램으로 열기(_P)"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2467
 msgid ""
-"Evolution cannot render this email as it is too large to handle. You can "
+"Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
 "전자메일 크기가 처리하기에 너무 커서 에볼루션에서 표시하지 못했습니다. 원본 "
@@ -12043,276 +12618,291 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "%2$d페이지 중 %1$d페이지"
 
-#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s' 가져오는 중"
 
-#: ../mail/em-format-html.c:916
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "외부 본문 부분이 없습니다."
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "외부 본문 부분의 형식이 잘못되었습니다."
 
-#: ../mail/em-format-html.c:954
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 사이트(%s)를 가리킵니다"
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "사이트 \"%2$s\"의 로컬 파일(%1$s)을 가리킵니다"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "로컬 파일(%s)을 가리킵니다"
 
-#: ../mail/em-format-html.c:988
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "원격 데이터(%s)을 가리킵니다"
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "알 수 없는 외부 데이터(\"%s\" 타입)을 가리킵니다"
 
-#: ../mail/em-format-html.c:1227
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
-msgstr "메세지를 포맷하는 중입니다"
+msgstr "메세지 내용을 표시하는 중입니다"
 
-#: ../mail/em-format-html.c:1394
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
-msgstr "메세지를 포맷하는 중입니다..."
+msgstr "메세지 내용을 표시하는 중입니다..."
 
-#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "참조"
 
-#: ../mail/em-format-html.c:1547 ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "숨은 참조"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "메일 프로그램"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1733
+#: ../mail/em-format-html.c:1771
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1738
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "날짜"
-
-#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-msgid "Newsgroups"
-msgstr "뉴스그룹"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1866
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "이 메세지는 <b>%s</b>이(가) <b>%s</b> 자격으로 보냈습니다."
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:314
 msgid "From"
 msgstr "보낸 사람"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "회신 주소"
 
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
+#: ../widgets/misc/e-dateedit.c:353
+msgid "Date"
+msgstr "날짜"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "뉴스그룹"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s 첨부"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1198
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME 메세지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1335 ../mail/em-format.c:1491
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME 메세지를 분석할 수 없습니다. 소스로 보여줍니다."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1343
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "multipart/encrypted에 지원하지 않는 암호화 방식을 사용했습니다"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1353
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME 메세지를 분석할 수 없습니다"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1353
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME 메세지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1510
 msgid "Unsupported signature format"
 msgstr "지원하지 않는 서명 형식입니다"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1589
 msgid "Error verifying signature"
 msgstr "서명을 확인하는 중 오류가 발생했습니다"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1580 ../mail/em-format.c:1589
 msgid "Unknown error verifying signature"
 msgstr "서명을 확인하는 중 알 수 없는 오류가 발생했습니다"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1661
 msgid "Could not parse PGP message"
 msgstr "PGP 메세지를 분석할 수 없습니다."
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1661
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP 메세지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "항상"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "매일"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "매주"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "매달"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "사용자 정의 정크 메일 헤더 추가"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "헤더 이름:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "헤더 값에 포함:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "값 포함"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "색"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "태그"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s 플러그인을 사용할 수 있고 프로그램 바이너리가 설치되어 있습니다."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s 플러그인을 사용할 수 없습니다. 패키지를 설치했는지 확인하십시오."
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "정크 메일 플러그인을 사용할 수 없습니다"
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "할 일"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "나중에"
 
-#: ../mail/em-migrate.c:1211
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"에볼루션 메일함 폴더의 위치와 구조가 에볼루션 1.x와 다르게 바뀌었습니다.\n"
-"\n"
-"폴더를 옮기는 동안 잠시 기다리십시오..."
+#: ../mail/em-migrate.c:1247
+#, c-format
+msgid "Migrating '%s':"
+msgstr "'%s' 옮기는 중:"
 
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "`%s' 폴더를 새로 만들 수 없습니다: %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "`%s' 폴더를 `%s' 폴더로 복사할 수 없습니다: %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "`%s'에 있는 메일함을 읽을 수 없습니다: %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../mail/em-migrate.c:1868
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"에볼루션 메일함 폴더의 위치와 구조가 에볼루션 1.x와 다르게 바뀌었습니다.\n"
+"\n"
+"폴더를 옮기는 동안 잠시 기다리십시오..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "과거의 POP keep-on-server 데이터 `%s'을(를) 열 수 없습니다: %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "POP keep-on-server 데이터 디렉토리 `%s' 디렉토리를 만들 수 없습니다: %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 keep-on-server 데이터 `%s'을(를) 복사할 수 없습니다: %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "`%s' 로컬 메일 저장고를 만들 수 없습니다: %s"
 
-#: ../mail/em-migrate.c:2827
+#: ../mail/em-migrate.c:2898
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"에볼루션 메일함 폴더의 형식이 에볼루션 버전 2.24 이후 sqlite로 바뀌었습니"
+"다.\n"
+"\n"
+"폴더를 옮기는 동안 잠시 기다리십시오..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "`%s'에 로컬 메일 폴더를 만들 수 없습니다: %s"
 
-#: ../mail/em-migrate.c:2846
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12320,64 +12910,67 @@ msgstr ""
 "이전에 설치한 에볼루션에서 설정을 잃어들일 수 없습니다. `evolution/config."
 "xmldb'가 없거나 망가졌습니다."
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 msgid "_Reply to sender"
 msgstr "보낸 이에게 회신(_R)"
 
 # List는 메일링 리스트를 말함.
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "리스트에 회신(_L)"
 
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
 msgid "_Add to Address Book"
 msgstr "주소록에 추가(_A)"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "이 저장고는 가입을 지원하지 않거나, 가입할 수 있도록 설정하지 않았습니다."
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "구독"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "폴더"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "서버를 선택하십시오."
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "서버를 선택하지 않았습니다"
 
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "이 메세지를 다시 보지 않기(_D)."
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "메세지 필터"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "메세지"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "메세지 저장..."
 
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "주소 추가"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "%s에서 온 메일"
@@ -12391,55 +12984,67 @@ msgid "Search Folder source"
 msgstr "폴더 소스 찾기"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "\"메일 보내고 받기\" 창 높이"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "\"메일 보내고 받기\" 최대화 상태"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Send and Receive Mail\" window width"
+msgstr "\"메일 보내고 받기\" 창 너비"
+
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
 msgstr "에볼루션에서 최대 크기만큼의 텍스트 일부분만 표시하도록 합니다"
 
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "항상 내용 읽음 확인 요청"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "오류를 상태 표시줄에 표시할 시간, 초 단위."
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "이모티콘 자동 인식"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "링크 자동 인식"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "정크메일 검사"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "인용문 강조 색"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "인용문 강조 색."
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "메세지 작성 창 기본 높이"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "메세지 작성 창 기본 너비"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "메세지 작성 읽어들이기/첨부 디렉토리"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "받는 사람/참조/숨은 참조의 주소를 간략하게 표시"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12447,63 +13052,81 @@ msgstr ""
 "받는 사람/참조/숨은 참조의 주소를 address_count에 지정한 개수만큼 간략하게 표"
 "시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid "Custom headers to use while checking for junk."
+msgstr "정크 메일을 검사할 때 사용할 사용자 지정 헤더."
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"정크 메일을 검사할 때 사용할 사용자 지정 헤더. 목록의 각 항목은 \"헤더이름=값"
+"\" 형식의 문자열입니다."
+
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Default charset in which to compose messages"
 msgstr "메세지를 작성할 기본 문자셋"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages."
 msgstr "메세지를 작성할 기본 문자셋."
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to display messages"
 msgstr "메세지를 표시할 기본 문자셋"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages."
 msgstr "메세지를 표시할 기본 문자셋."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default forward style"
 msgstr "기본 전달 모양새"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default height of the Composer Window."
 msgstr "메세지 작성 창의 기본 높이."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the message window."
 msgstr "메세지 창의 기본 높이."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the subscribe dialog."
 msgstr "구독 대화 상자의 기본 높이."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default reply style"
 msgstr "기본 회신 모양새"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default value for thread expand state"
 msgstr "글타래 확장 상태에 대한 기본값"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default width of the Composer Window."
 msgstr "메세지 작성 창의 기본 너비."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the message window."
 msgstr "메세지 창의 기본 너비."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the subscribe dialog."
 msgstr "구독 대화 상자의 기본 너비."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid ""
+"Determines whether to look up addresses for junk filtering in local "
+"addressbook only"
+msgstr "정크메일 필터링할 때 로컬 주소록에서만 주소를 찾아 볼 지 결정합니다"
+
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr "주소록에서 보낸 사람 전자메일을 찾아볼 지 결정합니다"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12514,11 +13137,11 @@ msgstr ""
 "팸 메일이 아니라고 판단합니다. 자동 완성 용도로도 주소록을 찾아 봅니다. LDAP"
 "와 같은 원격 주소록을 자동 완성에 사용할 경우 느릴 수도 있습니다."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "정크 메일 검사에 사용자 지정 헤더를 사용할 지 결정합니다"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12527,7 +13150,7 @@ msgstr ""
 "정크 메일 검사에 사용자 지정 헤더를 사용할 지 결정합니다. 이 옵션을 사용하고 "
 "헤더를 지정하면 정크 메일 검사 기능의 속도를 높일 수 있습니다."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -12535,55 +13158,59 @@ msgstr ""
 "세로 보기의 \"메세지\" 열에서 \"보낸 사람\" 및 \"제목\" 줄에 같은 글꼴을 사용"
 "할 지 결정합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Directory for loading/attaching files to composer."
 msgstr "메세지 작성에 파일을 읽어들이고 첨부할 때 사용할 디렉토리."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for saving mail component files."
 msgstr "메일 관련 파일을 저장할 디렉토리."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgstr "폴더 보기에서 폴더 이름 줄여 쓰기 사용을 막을 지 여부"
+
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Draw spelling error indicators on words as you type."
 msgstr "타이프할 때 맞춤법이 틀린 단어에 표시해 줍니다."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Empty Junk folders on exit"
 msgstr "끝날 때 정크메일 폴더를 비웁니다"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Trash folders on exit"
 msgstr "끝날 때 휴지통 폴더를 비웁니다"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "에볼루션이 끝날 때 모든 정크 메일 폴더를 비웁니다."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "에볼루션이 끝날 때 모든 휴지통 폴더를 비웁니다."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "캐릿 모드를 켭니다, 이 모드에서는 메일을 읽을 때 커서가 보입니다."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable or disable magic space bar"
 msgstr "만능 스페이스바 사용 여부"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable type ahead search feature"
 msgstr "텍스트 입력 미리 찾기 기능 사용"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable search folders"
 msgstr "찾기 폴더 사용"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders on startup."
 msgstr "시작할 때 찾기 폴더 사용."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12593,7 +13220,7 @@ msgstr ""
 "보조 모음의 찾기 기능을 사용해 텍스트를 입력해서 찾기를 시작할 수 있습니다. "
 "폴더의 이름을 입력하면 보조 모음에 있는 해당 폴더로 바로 이동합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12601,33 +13228,33 @@ msgstr ""
 "이 기능을 사용하면 스페이스바 키를 이용해 메세지 미리 보기, 메세지 목록, 폴더"
 "를 스크롤합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable to render message text part of limited size."
 msgstr "제한된 크기만큼의 일부 텍스트를 표시하도록 합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable/disable caret mode"
 msgstr "캐릿 모드 켜기/끄기"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Height of the message-list pane"
 msgstr "메세지 목록 창의 높이"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane."
 msgstr "메세지 목록 창의 높이."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "폴더별 미리 보기를 감추고 선택을 없앱니다"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "사용자가 10개 이상의 메세지를 한번에 열면, 정말로 열 지 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12635,7 +13262,7 @@ msgstr ""
 "\"미리 보기\" 창이 켜져 있는 경우, 창을 위아래가 아니라 옆으로 나란히 표시합"
 "니다."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12645,11 +13272,39 @@ msgstr ""
 "서 보노보 컴포넌트 뷰어로 매핑되는 (그놈의 MIME타입 데이터베이스에서) 뷰어가 "
 "내용을 표시하는 데 사용됩니다."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"\"메일 보내고 받기\" 창의 최초 높이. 사용자가 세로 방향으로 창 크기를 바꾸면 "
+"이 값이 바뀝니다."
+
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+"\"메일 보내고 받기\" 창의 최초 최대화 상태. 사용자가 이 창을 최대화하거나 취"
+"소할 때마다 이 값이 바뀝니다. \"메일 보내고 받기\" 창은 최대화할 수 없기 때문"
+"에 이 값은 실제로는 사용하지 않습니다. 이 키는 내부적 용도로만 사용합니다."
+
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"\"메일 보내고 받기\" 창의 최초 너비. 사용자가 가로 방향으로 창 크기를 바꾸면 "
+"이 값이 바뀝니다."
+
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "여러 개의 메세지에 표시할 때 확인 질문을 할 지 여부를 결정합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -12657,7 +13312,7 @@ msgstr ""
 "오프라인 모드로 들어갈 때 오프라인 동기화가 필요한 지 여부를 반복해서 묻는 질"
 "문 기능을 끄고 켭니다."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -12666,31 +13321,31 @@ msgstr ""
 "찾기 결과에서 지우는 게 아니라, 찾기 폴더에서 메세지를 지울 경우 메세지를 영"
 "구히 지운다고 반복해서 경고하는 기능을 끄고 켭니다."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Last time empty junk was run"
 msgstr "마지막으로 정크 메일을 비운 시각"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty trash was run"
 msgstr "마지막으로 휴지통을 비운 시각"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Level beyond which the message should be logged."
 msgstr "어떤 메세지를 기록할 지 단계."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "List of Labels and their associated colors"
 msgstr "레이블 및 레이블 색의 목록"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of accepted licenses"
 msgstr "승인한 약관의 목록"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accounts"
 msgstr "계정 목록"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12698,11 +13353,15 @@ msgstr ""
 "에볼루션의 메일 컴포넌트에 사용할 계정 목록입니다. 이 목록에는 /apps/"
 "evolution/mail/accounts에 상대적인 서브디렉토리의 이름이 들어 있습니다."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of custom headers and whether they are enabled."
 msgstr "사용자 지정 헤더와 그 헤더를 사용할 지 여부의 목록."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "List of dictionary language codes used for spell checking."
+msgstr "맞춤법 검사에 사용할 사전의 언어 코드 목록."
+
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12710,19 +13369,19 @@ msgstr ""
 "에볼루션의 메일 컴포넌트에 사용할 레이블 목록입니다. 이 목록에는 <이름>:<색> "
 "형식의 문자열이 들어 있습니다. 색은 HTML 방식 16진수 인코딩을 사용합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "보노보 컴포넌트 뷰어가 있는 지 검사할 MIME 타입 목록"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of protocol names whose license has been accepted."
 msgstr "약관에 동의한 프로토콜 이름의 목록."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Load images for HTML messages over http"
 msgstr "http로 HTML 메세지의 그림을 읽어들입니다"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net. 1 - Load images in messages from contacts. 2 - "
@@ -12732,242 +13391,239 @@ msgstr ""
 "서 그림을 하나도 읽어들이지 않습니다. 1 - 보낸 사람이 주소록에 들어 있으면 그"
 "림을 읽어들입니다. 2 - 항상 네트워크에서 그림을 읽어들입니다."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Log filter actions"
 msgstr "필터 동작 기록"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions to the specified log file."
 msgstr "지정한 로그 파일에 대한 필터 동작을 기록합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Logfile to log filter actions"
 msgstr "필터 동작을 기록할 로그 파일"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions."
 msgstr "필터 동작을 기록할 로그 파일입니다."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Mark as Seen after specified timeout"
 msgstr "일정 시간이 지나면 읽은 것으로 표시하기"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout."
 msgstr "일정 시간이 지나면 읽은 것으로 표시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark citations in the message \"Preview\""
 msgstr "메세지 \"미리 보기\"에서 인용한 부분을 표시하기"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\"."
 msgstr "메세지 \"미리 보기\"에서 인용한 부분을 표시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Message Window default height"
 msgstr "메세지 창 기본 높이"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default width"
 msgstr "메세지 창 기본 너비"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "메세지-표시 모양새 (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Minimum days between emptying the junk on exit"
 msgstr "끝날 때 정크 메일을 비울 최소 날짜 간격"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the trash on exit"
 msgstr "끝날 때 휴지통을 비울 최소 날짜 간격"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "끝날 때 휴지통을 비울 최소 시간 간격."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "끝날 때 휴지통을 비울 최소 시간 간격."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "받는 사람/참조/숨은 참조에 표시할 주소의 길이"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Prompt on empty subject"
 msgstr "제목이 없으면 물어보기"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "사용자가 폴더의 지운 메세지를 비우려 할 때 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "제목 없는 메세지를 보내려 할 때 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "사용자에게 즉시 오프라인으로 할 지를 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt when deleting messages in search folder"
 msgstr "찾기 폴더에서 메세지를 지울 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when user expunges"
 msgstr "사용자가 지운 메세지를 비우려 할 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user only fills Bcc"
 msgstr "Bcc만 사용했을 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "10개 이상의 메세지를 열려고 할 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 "HTML 메세지를 원하지 않는 사람한테 HTML 메일을 보내려 할 때 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "To나 Cc로 받는 사람이 없는 상태로 메세지를 보내려 할 때 물어봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "원하지 않는 HTML을 보내려 할 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt while marking multiple messages"
 msgstr "여러 개 메세지에 표시하려 할 때 물어봅니다"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "텍스트 스마일리를 인식하고 그림으로 바꿉니다."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize links in text and replace them."
 msgstr "텍스트에 들어 있는 링크를 인식하고 바꿉니다."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Run junk test on incoming mail."
 msgstr "받은 메일에 대해 정크메일 검사를 실행합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Save directory"
 msgstr "저장 디렉토리"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Search for the sender photo in local addressbooks"
 msgstr "로컬 주소록에서 보낸 사람의 사진을 찾습니다"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Send HTML mail by default"
 msgstr "기본으로 HTML 메일 보내기"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default."
 msgstr "기본으로 HTML 메일을 보냅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Sender email-address column in the message list"
 msgstr "메세지 목록의 보낸 사람 전자메일 주소 열"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Show Animations"
 msgstr "애니메이션 보기"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Show animated images as animations."
 msgstr "애니메이션이 들어 있는 그림을 애니메이션으로 봅니다."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "메세지 목록에 지워진 메세지를 표시합니다 (취소선을 긋습니다)."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show deleted messages in the message-list"
 msgstr "메세지 목록에 지워진 메세지를 표시합니다"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show photo of the sender"
 msgstr "보낸 사람의 사진을 보여줍니다"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "메세지 목록의 별도 열에 보낸 사람의 전자메일을 표시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "메세지 읽기 창에서 보낸 사람의 사진을 표시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "Specifies the header to check for junk."
-msgstr "정크 메일을 검사할 헤더를 지정합니다."
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr ""
-"정크 메일을 검사할 헤더를 지정합니다. gconf에서 헤더이름=값 형식입니다."
-
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Spell check inline"
 msgstr "인라인 맞춤법 검사"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Spell checking color"
+msgstr "맞춤법 검사 색"
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Spell checking languages"
+msgstr "맞춤법 검사 언어"
+
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Subscribe dialog default height"
 msgstr "구독 대화 상자 기본 높이"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Subscribe dialog default width"
 msgstr "구독 대화 상자 기본 너비"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Terminal font"
 msgstr "터미널 글꼴"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Text message part limit"
 msgstr "텍스트 메세지 최대 크기"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "The default plugin for Junk hook"
 msgstr "정크 메일 후크에 대한 기본 플러그인"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "마지막으로 정크 메일을 비운 시각, 1970년 1월 1일부터 지난 날 수."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "마지막으로 휴지통을 비운 시각, 1970년 1월 1일부터 지난 날 수."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The terminal font for mail display."
 msgstr "메일을 표시할 때 사용할 터미널 글꼴."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The variable width font for mail display."
 msgstr "메일을 표시할 때 사용할 가변폭 글꼴."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr "세 가지 값이 가능합니다. 0은 오류, 1은 경고, 2는 디버깅 메세지."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -12975,7 +13631,7 @@ msgstr ""
 "에볼루션에서 표시할 수 있는 텍스트의 최대 크기를 지정합니다. 기본값은 4MB / "
 "4096 KB이고 단위는 KB입니다."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -12985,7 +13641,7 @@ msgstr ""
 "다. 기본 목록 플러그인을 사용하지 않는 경우, 사용 가능한 다른 플러그인을 대"
 "신 사용하지 않습니다."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "This key is read only once and reset to false after read. This unselects the "
 "mail in the list and removes the preview for that folder."
@@ -12993,7 +13649,7 @@ msgstr ""
 "이 키는 한 번만 읽고 읽은 다음에 거짓으로 다시 설정됩니다. 목록의 메일의 선택"
 "을 지우고 그 폴더에 대한 미리 보기를 없앱니다."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13004,11 +13660,20 @@ msgstr ""
 "리스트가 들어 있습니다. XML 구조의 형식은 &lt;header enabled&gt;입니다 - 헤더"
 "를 메일 보기에서 표시하면 enabled로 설정합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local addressbook only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+"이 옵션은 lookup_addressbook 키와 관련 있습니다. 이 옵션에 따라 로컬 주소록에"
+"서 주소를 찾아 보고, 알려진 사람이 보낸 메일을 정크메일 필터에서 제외합니다."
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "This option would help in improving the speed of fetching."
 msgstr "이 옵션으로 가져오기 속도를 높일 수 있습니다."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13016,7 +13681,7 @@ msgstr ""
 "기본 메세지 목록 보기에서 표시할 주소의 길이를 지정합니다. 길이를 넘어가면 "
 "'...'으로 표시합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13024,7 +13689,7 @@ msgstr ""
 "이 설정은 기본값으로 글타래를 확장 상태로 할 지 축소 상태로 할 지 지정합니"
 "다. 에볼루션을 다시 시작해야 합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13033,107 +13698,127 @@ msgstr ""
 "이 설정은 해당 글타래의 최근 메세지를 기준으로 글타래를 정렬할 지 여부를 지정"
 "합니다. 에볼루션을 다시 시작해야 합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Thread the message list."
 msgstr "연관된 메세지를 글타래로 만듭니다."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Thread the message-list"
 msgstr "연관된 메세지를 글타래로"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message-list based on Subject"
 msgstr "제목에 따라 메세지 목록을 글타래 표시합니다"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Time interval, in seconds, how often upload store changes to server."
+msgstr "서버에 바뀐 사항을 얼마나 자주 업로드할 지 시간 간격 (초 단위)."
+
+#: ../mail/evolution-mail.schemas.in.h:152
+msgid ""
+"Time interval, in seconds, how often upload store changes to server. The "
+"actual value cannot be less than 30 seconds."
+msgstr ""
+"서버에 바뀐 사항을 얼마나 자주 업로드할 지 시간 간격 (초 단위). 이 값은 30초"
+"보다 작으면 안 됩니다."
+
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "메세지를 읽은 것으로 표시하는 경과 시간"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "메세지를 읽은 것으로 표시하는 경과 시간."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "기본 계정의 UID 문자열."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr "인라인 맞춤법 검사를 사용할 때 맞춤법이 틀린 단어에 밑줄 그을 색."
+
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
 msgstr "스팸어새신 데몬 및 클라이언트 사용"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "스팸어새신 데몬 및 클라이언트를 (spamc/spamd) 사용합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "사용자 설정 글꼴 사용"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "메일을 표시할 때 사용자 지정 글꼴을 사용합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "로컬 스팸 테스트만 사용합니다."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "로컬 스팸 테스트만 사용합니다 (DNS는 사용하지 않습니다)."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "나란히 혹은 옆으로 길게 배치"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "가변폭 글꼴"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "보기/숨은 참조 메뉴 항목이 체크"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "보기/숨은_참조 메뉴 항목이 체크."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "보기/참조 메뉴 항목이 체크"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "보기/참조 메뉴 항목이 체크."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "보기/보낸 사람 메뉴 항목이 체크"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "보기/보낸 사람 메뉴 항목이 체크."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "보기/게시_위치 메뉴 항목이 체크"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "보기/게시_위치 메뉴 항목이 체크."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "보기/회신_주소 메뉴 항목이 체크"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "보기/회신_주소 메뉴 항목이 체크."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "기본값으로 내용 읽음 확인 요청을 모든 메세지에 더할 지 여부."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgstr "폴더 보기에서 폴더 이름 줄여 쓰기 사용을 막을 지 여부."
+
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13141,43 +13826,43 @@ msgstr ""
 "메세지에 In-Reply-To 혹은 References 헤더가 없을 경우에 대신에 제목으로 글타"
 "래 표시를 할 것인지 여부."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "해당 글타래의 최근 메세지를 기준으로 글타래를 정렬할 지 여부"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "메세지 목록 창의 너비"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "메세지 목록 창의 너비."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "ELM 데이터 가져오기"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
-msgstr "에볼루션 ELM 가져오기 프로그램"
+msgstr "에볼루션 ELM 가져오기"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "ELM에서 메일을 가져옵니다."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "대상 폴더:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "어느 폴더로 가져올 지 선택하십시오"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "버클리 메일박스 (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "버클리 메일박스 형식 폴더 가져오기"
 
@@ -13185,7 +13870,7 @@ msgstr "버클리 메일박스 형식 폴더 가져오기"
 msgid "Importing mailbox"
 msgstr "메일함 가져오기"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
 #, c-format
 msgid "Importing `%s'"
 msgstr "%s 가져오는 중입니다"
@@ -13195,15 +13880,15 @@ msgstr "%s 가져오는 중입니다"
 msgid "Scanning %s"
 msgstr "%s 검색하는 중입니다"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "PINE 데이터 가져오기"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
-msgstr "에볼루션 PINE 가져오기 프로그램"
+msgstr "에볼루션 PINE 가져오기"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "PINE에서 메일을 가져옵니다."
 
@@ -13231,131 +13916,144 @@ msgstr "%s 메일링 리스트"
 msgid "Add Filter Rule"
 msgstr "필터 규칙 추가"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "서식"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d개 선택, "
 
-#: ../mail/mail-component.c:540
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d개 지움"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d개 정크"
 
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d개 임시"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d개 보냄"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d개 안 보냄"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d개 안 읽음, "
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "전체 %d개"
 
-#: ../mail/mail-component.c:896
+#: ../mail/mail-component.c:914
 msgid "New Mail Message"
 msgstr "새 메일 메세지"
 
-#: ../mail/mail-component.c:897
+#: ../mail/mail-component.c:915
 msgid "_Mail Message"
 msgstr "메일 만들기(_M)"
 
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:916
 msgid "Compose a new mail message"
 msgstr "메일 메세지를 새로 작성합니다"
 
-#: ../mail/mail-component.c:904
+#: ../mail/mail-component.c:922
 msgid "New Mail Folder"
 msgstr "새 메일 폴더"
 
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:923
 msgid "Mail _Folder"
 msgstr "메일 폴더(_F)"
 
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:924
 msgid "Create a new mail folder"
 msgstr "새 메일 폴더를 만듭니다"
 
-#: ../mail/mail-component.c:1053
+#: ../mail/mail-component.c:1071
 msgid "Failed upgrading Mail settings or folders."
 msgstr "메일 설정 혹은 폴더를 업그레이드하는 데 실패했습니다."
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1584
 msgid "Error"
 msgstr "오류"
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1584
 msgid "Errors"
 msgstr "오류"
 
-#: ../mail/mail-component.c:1523
+#: ../mail/mail-component.c:1585
 msgid "Warnings and Errors"
 msgstr "경고 및 오류"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1586
 msgid "Debug"
 msgstr "디버깅"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1586
 msgid "Error, Warnings and Debug messages"
 msgstr "오류, 경고 및 디버깅 메세지"
 
-#: ../mail/mail-component.c:1634
+#: ../mail/mail-component.c:1713
 msgid "Debug Logs"
 msgstr "디버깅 기록"
 
-#: ../mail/mail-component.c:1638
+#: ../mail/mail-component.c:1727
 msgid "Show _errors in the status bar for"
 msgstr "상태 표시줄에서 오류 표시 시간(_E):"
 
-#: ../mail/mail-component.c:1645
-msgid "seconds."
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1743
+msgid "second(s)."
 msgstr "초."
 
-#: ../mail/mail-component.c:1655
+#: ../mail/mail-component.c:1749
 msgid "Log Messages:"
 msgstr "기록 메세지:"
 
-#: ../mail/mail-component.c:1707
+#: ../mail/mail-component.c:1790
 msgid "Log Level"
 msgstr "기록 단계"
 
-#: ../mail/mail-component.c:1714 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1799 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "시간"
 
-#: ../mail/mail-component.c:1721 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1809 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "메세지"
 
+#: ../mail/mail-component.c:1818 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "이 창을 닫습니다"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "지원하는 방법인지 확인(_E) "
@@ -13369,7 +14067,7 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>이 에볼루션 빌드는 SSL을 지원하지 않습니다</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>보내는 사람 사진</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13450,74 +14148,74 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">인쇄 글꼴</span>"
 
 #: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">프록시 설정</span>"
+
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">필수 정보</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">보안 MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">보안</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">보낸 편지함 및 임시 보관함</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">서버 설정</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">인증 방법(_A)</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "계정 관리"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "새 서명 추가(_W)..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "스크립트 추가(_S)"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "이 계정으로 보내는 메세지는 항상 서명(_W)"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "암호화한 메일을 보낼 때 자신에 대해서도 암호화(_F)"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "항상 참조(CC) (_S):"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "항상 숨은 참조(BCC) (_B):"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "암호화할 때 내 키 모음에 들어 있는 키는 언제나 신뢰(_T)"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "암호화한 메일을 보낼 때 자신에 대해서 언제나 암호화(_M)"
 
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr "항상 내용 읽음 확인 요청(_D)"
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "원문 첨부"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
 msgstr "자동으로 이모티콘 그림 넣기(_E)"
@@ -13535,13 +14233,13 @@ msgid "C_haracter set:"
 msgstr "문자셋(_H):"
 
 #: ../mail/mail-config.glade.h:50
-msgid "C_heck custom headers for junk"
-msgstr "정크 메일 검사에 사용자 지정 헤더 검사(_H)"
-
-#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "지원하는 형식인지 확인(_E) "
 
+#: ../mail/mail-config.glade.h:51
+msgid "Check cu_stom headers for junk"
+msgstr "정크 메일 검사에 사용자 지정 헤더 검사(_S)"
+
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
 msgstr "받은 메일이 정크 메일인지 검사(_M)"
@@ -13602,17 +14300,19 @@ msgstr "끝날 때 정크 메일 지우기(_X)"
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "보내는 메세지에 (기본값으로) 디지털 서명(_U)"
 
+# FIXME - hard to translate UI + string based on English grammar
+# "Do not format messages when text size exceeds" ____ "KB"
 #: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
-msgstr "보낸 사람이 주소록에 들어 있으면 정크메일로 표시하지 않기(_N)"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "메세지의 크기가 다음을 넘어가면 내용 표시하지 않기(_Z): "
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr "메세지의 텍스트 크기가 다음을 넘어가면 내용 표시하지 않기(_Z): "
+msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgstr "보낸 사람이 주소록에 들어 있으면 정크메일로 표시하지 않기(_K)"
 
 #: ../mail/mail-config.glade.h:73
-msgid "Do not quote original message"
-msgstr "원문 인용하지 않음"
+msgid "Do not quote"
+msgstr "인용하지 않기"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -13675,69 +14375,85 @@ msgid "HTML Messages"
 msgstr "HTML 메세지"
 
 #: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr "HTTP 프록시(_T):"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "헤더"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "인용문은 다음 색깔로 표시(_Q):"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "인라인"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
-msgstr "인라인 원본 메세지 (Outlook 형식)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr "인라인 (Outlook 방식)"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "레이블"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "언어 표"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "메일 설정"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "메일 헤더 표"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "메일함 위치"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "메세지 작성"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr "프록시 없는 호스트(_P):"
+
+#: ../mail/mail-config.glade.h:107
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr "주의: 레이블의 밑줄은 메뉴의 단축키를 지정하는 데 사용합니다."
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "알림: 처음 연결하면 암호를 물어보는 창이 뜰 것입니다"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "사용자 지정 정크 메일 헤더가 있으면 이 옵션은 무시합니다."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "조직(_G):"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 키 ID(_K):"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:112
+msgid "Pass_word:"
+msgstr "암호(_W):"
+
+#: ../mail/mail-config.glade.h:114
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13745,7 +14461,7 @@ msgstr ""
 "아래 공백에 이 계정에 대해 설명하는 이름을 입력하십시오.\n"
 "이 이름은 표시하는 목적으로만 사용합니다."
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13753,122 +14469,130 @@ msgstr ""
 "메일을 보낼 방법에 대해 정보를 입력하십시오. 잘 모르겠으면, 시스템 관리자나 "
 "인터넷 서비스 제공자에게 물어 보십시오."
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:117
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 "아래에 이름과 메일 주소를 입력하십시오. 그 아래에 있는 \"선택\" 필드는 메일"
-"을 보낼 때 정보를 더하지 않고 싶으면 채우지 않아도 됩니다."
+"을 보낼 때 정보를 추가하지 않고 싶으면 채우지 않아도 됩니다."
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "다음 옵션 중에 하나를 선택하십시오"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+msgid "Port:"
+msgstr "포트:"
+
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "숨은 참조로만 메세지를 보낼 때 확인 질문(_O)"
 
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr "원문 인용"
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "인용"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "암호 기억(_M)"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "회신 주소(_P):"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "암호 기억(_P)"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
+msgstr "SOCKS 호스트(_O):"
+
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "로컬 주소록에서만 보낸 사람의 사진 찾기(_E)"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "선택(_E)..."
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "메세지 수신 확인 보내기(_E):"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "일반 글꼴(_T):"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "HTML 고정폭 글꼴을 선택하십시오"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "인쇄에 사용할 HTML 고정폭 글꼴을 선택하십시오"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "HTML 가변폭 글꼴을 선택하십시오"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "인쇄에 사용할 HTML 가변폭 글꼴을 선택하십시오"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "메일 보내기"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "보낸 편지함 폴더(_M):"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "서버에 인증이 필요(_V)"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "서버 종류(_T): "
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "서명 인증서(_N):"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "서명(_U):"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "서명"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "서명 표"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "맞춤법 검사"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr "답장할 때 맨 아래부터 입력 시작(_T)"
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "방법(_Y): "
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "이 언어 목록은 사전을 설치한 언어만 들어 있습니다."
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13877,12 +14601,7 @@ msgstr ""
 "다음 스크립트의 출력을 서명으로 사용합니다. \"이름\"은 표시 목적으로만 이용합"
 "니다."
 
-#: ../mail/mail-config.glade.h:146
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr "사용자 지정 정크 메일 헤더가 있으면 이 옵션보다 우선합니다."
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13890,16 +14609,24 @@ msgstr ""
 "이 계정에 쓸 이름을 입력하십시오.\n"
 "예: \"작업용\" 또는 \"개인용\""
 
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:154
+msgid "Us_ername:"
+msgstr "사용자이름(_E):"
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "인증 사용(_N)"
+
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:364
 msgid "User_name:"
 msgstr "사용자이름(_N):"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "가변폭(_A):"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13909,102 +14636,129 @@ msgstr ""
 "\n"
 "시작하려면 \"앞으로\"를 누르십시오. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "서명 추가(_A)"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "항상 인터넷에서 그림 읽어들이기(_A)"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr "자동 프록시 설정 URL(_A):"
+
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "기본 정크 메일 플러그인(_D):"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "인터넷에 직접 연결(_D)"
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "모임 요청에 서명하지 않기 (Outlook 호환)(_D)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "전달 모양(_F):"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "답장을 쓸 때 원문 위에 서명 놓기(_K)"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "주소록에 있는 사람이 보낸 메일의 그림 읽어들이기(_L)"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local addressbook only"
+msgstr "로컬 주소록만 찾아 보기(_L)"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "내 기본 계정으로 하기(_M)"
 
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr "수동 프록시 설정(_M):"
+
 # FIXME - hard to translate UI + string based on English grammar
 # "Mark messages as read after <seconds> seconds"
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "다음 시간이 지나면 읽은 것으로 표시(_M):"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "그림을 인터넷에서 읽어들이지 않기(_N)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "경로(_P):"
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr "HTML을 받고 싶지 않은 사람한테 보낼 때 확인 질문(_P)"
+#: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "HTML 메일을 받고 싶지 않은 사람한테 보낼 때 확인 질문(_P)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "제목이 없이 메세지를 보낼 때 확인 질문(_P)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "회신 모양(_R):"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "스크립트(_S):"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr "보안 HTTP 프록시(_S):"
+
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "선택(_S)..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "그림 애니메이션 보기(_S)"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "메일 미리 보기에서 보낸 사람의 사진 보기(_S)"
 
-#: ../mail/mail-config.glade.h:176
+# FIXME - hard to translate UI + string based on English grammar
+# "Shrink To / Cc / Bcc headers to ____ addresses"
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "받는 사람 / 참조 / 숨은 참조 헤더 줄이기(_S): "
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "보안 연결 사용(_U):"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "시스템 기본값 사용(_U)"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "다른 프로그램과 같은 글꼴 사용(_U)"
 
-#: ../mail/mail-config.glade.h:179
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "개 주소"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "색상"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "설명"
 
@@ -14044,43 +14798,43 @@ msgstr "대소문자 구별(_S)"
 msgid "Co_mpleted"
 msgstr "완료됨(_M)"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "찾기(_I):"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "메세지에서 찾음"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
 msgid "Flag to Follow Up"
 msgstr "추가 작업 메세지 플래그"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "폴더 구독"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "사용권 약관"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "선택하지 않았습니다"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "서버(_E):"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "보안 정보"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "지정한 폴더"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14088,24 +14842,24 @@ msgstr ""
 "다음은 추가 작업 플래그를 표시하려고 선택한 메세지입니다.\n"
 "\"플래그\" 메뉴에서 추가 작업 동작을 선택하십시오."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "사용권 동의(_A)"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "마감(_D):"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "표시(_F):"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "사용권 약관에 동의하시면 여기에 체크하십시오(_T)"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "\"%s\" 연결을 확인하는 중"
@@ -14156,11 +14910,11 @@ msgstr "%2$d개 중에서 %1$d번째 메세지를 보내는 중"
 msgid "Failed to send %d of %d messages"
 msgstr "%2$d개 메세지 중에서 %1$d번째를 보내는 데 실패했습니다"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "취소함."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "완료."
 
@@ -14185,82 +14939,89 @@ msgstr "메시지들을 %s(으)로 복사하는 중"
 msgid "Forwarded messages"
 msgstr "전달한 메시지"
 
+# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
 #: ../mail/mail-ops.c:1205
 #, c-format
 msgid "Opening folder %s"
-msgstr "%s 폴더를 열기"
+msgstr "%s 폴더를 여는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
 #: ../mail/mail-ops.c:1270
 #, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "%s 폴더의 용량 제한 정보를 가져오는 중"
+
+# 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
+#: ../mail/mail-ops.c:1339
+#, c-format
 msgid "Opening store %s"
 msgstr "저장고 %s을(를) 여는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1410
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s 폴더를 지우는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1499
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s 폴더를 저장하는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1562
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "계정 '%s'의 지운 메세지를 비우고 내용을 저장하는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1563
 #, c-format
 msgid "Storing account '%s'"
 msgstr "%s 계정을 저장하는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1617
 msgid "Refreshing folder"
 msgstr "폴더 다시 읽는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
 msgid "Expunging folder"
 msgstr "지운 메세지를 비우는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1704
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' 안의 휴지통을 비우는 중"
 
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1705
 msgid "Local Folders"
 msgstr "로컬 폴더"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1786
 #, c-format
 msgid "Retrieving message %s"
 msgstr "메세지 %s을(를) 가져오는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1893
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "메세지 %d개를 가져오는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:1906
+#: ../mail/mail-ops.c:1978
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "메세지 %d개를 저장하는 중"
 
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14270,11 +15031,11 @@ msgstr ""
 " %s"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2128
 msgid "Saving attachment"
 msgstr "첨부 저장"
 
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14283,55 +15044,55 @@ msgstr ""
 "출력 파일을 만들 수 없음: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2169
 #, c-format
 msgid "Could not write data: %s"
-msgstr "데이터를 쓸 수가 없습니다: %s"
+msgstr "데이터를 쓸 수 없습니다: %s"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s에서 연결 끊는 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(으)로 다시 연결중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2411
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "'%s' 오프라인 계정을 준비 중"
 
 # 주의: 다른 메세지의 일부로 쓰인다. 문장으로 번역하지 말 것.
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2497
 msgid "Checking Service"
 msgstr "서비스 확인중"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:182
 msgid "Canceling..."
 msgstr "취소하는 중..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:385
 msgid "Send & Receive Mail"
-msgstr "메일 주고받기"
+msgstr "메일 보내고 받기"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:396
 msgid "Cancel _All"
 msgstr "모두 취소(_A)"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:505
 msgid "Updating..."
 msgstr "업데이트 중..."
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
 msgid "Waiting..."
 msgstr "기다리는 중..."
 
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:806
 #, c-format
 msgid "Checking for new mail"
 msgstr "새 메일 확인"
@@ -14359,17 +15120,17 @@ msgstr "암호 입력"
 msgid "User canceled operation."
 msgstr "사용자가 취소한 동작."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "서명 편집"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "저장 후 닫기(_S)"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "이 서명의 이름을 입력하십시오."
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "서명 편집"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "이름:"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "서명 이름(_S):"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14410,55 +15171,47 @@ msgstr "'%s:%s'에 대한 찾기 폴더를 업데이트하는 중입니다"
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s에 대한 찾기 폴더를 업데이트하는 중입니다"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "찾기 폴더 편집"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "새 찾기 폴더"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
-msgstr ""
-"&quot;{0}&quot;(이)라는 이름의 폴더가 이미 있습니다. 다른 이름을 사용하십시"
-"오."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "\"{0}\"(이)라는 이름의 폴더가 이미 있습니다. 다른 이름을 사용하십시오."
 
 #: ../mail/mail.error.xml.h:2
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr ""
-"&quot;{1}&quot;(이)라는 이름의 폴더가 이미 있습니다. 다른 이름을 사용하십시"
-"오."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "\"{1}\"(이)라는 이름의 폴더가 이미 있습니다. 다른 이름을 사용하십시오."
 
 #: ../mail/mail.error.xml.h:3
 msgid ""
-"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"A non-empty folder at \"{1}\" already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 msgstr ""
-"&quot;{1}&quot;에 비어 있지 않은 폴더가 있습니다.\n"
+"\"{1}\"에 비어 있지 않은 폴더가 있습니다.\n"
 "\n"
 "이 폴더를 무시할 수도 있고, 덮어 쓰거나, 그 내용 뒤에 덧붙이거나, 끝낼 수 있"
 "습니다."
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr ""
-"&quot;{1}&quot;에 대해 내용 읽음 확인을 요청받았습니다.  {0}에게 내용 읽음 확"
-"인을 보내시겠습니까?"
+"\"{1}\"에 대해 내용 읽음 확인을 요청받았습니다.  {0}에게 내용 읽음 확인을 보"
+"내시겠습니까?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
-msgstr ""
-"&quot;{1}&quot;(이)라는 이름의 서명이 이미 있습니다. 다른 이름을 사용하십시"
-"오."
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr "\"{1}\"(이)라는 이름의 서명이 이미 있습니다. 다른 이름을 사용하십시오."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -14494,8 +15247,8 @@ msgstr "모든 폴더의 지워진 메세지를 완전히 지우시겠습니까?
 #: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
-msgstr "정말로 &quot;{0}&quot; 폴더의 지운 메세지를 완전히 비우시겠습니까?"
+"folder \"{0}\"?"
+msgstr "\"{0}\" 폴더의 모든 지워진 메세지를 완전히 지우시겠습니까?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14510,99 +15263,102 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "정말로 제목 없는 메세지를 보내시겠습니까?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 때문입니다."
+msgid "Because \"{0}\"."
+msgstr "\"{0}\" 때문입니다."
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
-msgstr "&quot;{2}&quot; 때문입니다."
+msgid "Because \"{2}\"."
+msgstr "\"{2}\" 때문입니다."
 
 #: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "서명 없음"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 찾기 폴더를 더할 수 없습니다."
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "\"{0}\" 찾기 폴더를 더할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "&quot;{0}&quot; 폴더를 &quot;{1}&quot;에 복사할 수 없습니다."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "\"{0}\" 폴더를 \"{1}\"에 복사할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 폴더를 만들 수 없습니다."
+msgid "Cannot create folder \"{0}\"."
+msgstr "\"{0}\" 폴더를 만들 수 없습니다."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
-msgstr "임시 저장 디렉토리를 만들 수가 없습니다."
+msgstr "임시 저장 디렉토리를 만들 수 없습니다."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "&quot;{1}&quot; 때문에 디렉토리를 저장할 수 없습니다."
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "\"{1}\" 때문에 디렉토리를 저장할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 폴더를 지울 수 없습니다."
+msgid "Cannot delete folder \"{0}\"."
+msgstr "\"{0}\" 폴더를 지울 수 없습니다."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 시스템 폴더를 지울 수 없습니다."
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "\"{0}\" 시스템 폴더를 지울 수 없습니다."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "&quot;{0}&quot; 찾기 폴더를 편집할 수 없습니다: 폴더가 없습니다."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "\"{0}\" 찾기 폴더를 편집할 수 없습니다: 폴더가 없습니다."
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "&quot;{0}&quot; 폴더를 &quot;{1}&quot;에 옮기지 못했습니다."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "\"{0}\" 폴더를 \"{1}\"에 옮기지 못했습니다."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr "&quot;{1}&quot; 소스를 열 수 없습니다"
+msgid "Cannot open source \"{1}\""
+msgstr "\"{1}\" 소스를 열 수 없습니다"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr "&quot;{2}&quot; 소스를 열 수 없습니다."
+msgid "Cannot open source \"{2}\"."
+msgstr "\"{2}\" 소스를 열 수 없습니다."
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
-msgstr "&quot;{2}&quot; 대상을 열 수 없습니다."
+msgid "Cannot open target \"{2}\"."
+msgstr "\"{2}\" 대상을 열 수 없습니다."
 
 #: ../mail/mail.error.xml.h:34
 msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"license."
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
 msgstr ""
-"&quot;{0}&quot; 라이선스 파일을 읽을 수 없습니다, 설치 문제 때문입니다. 이 라"
-"이선스에 동의하기 전에는 이 제공자를 사용할 수 없습니다."
+"\"{0}\" 라이선스 파일을 읽을 수 없습니다, 설치 문제 때문입니다. 이 라이선스"
+"에 동의하기 전에는 이 제공자를 사용할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "&quot;{0}&quot;을(를) &quot;{1}&quot;(으)로 이름을 바꾸지 못했습니다."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "\"{0}\"을(를) \"{1}\"(으)로 이름을 바꾸지 못했습니다."
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 시스템 폴더의 이름을 바꾸거나 옮길 수 없습니다."
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "\"{0}\" 시스템 폴더의 이름을 바꾸거나 옮길 수 없습니다."
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "바뀐 사항을 계정에 저장할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 디렉토리에 저장할 수 없습니다."
+msgid "Cannot save to directory \"{0}\"."
+msgstr "\"{0}\" 디렉토리에 저장할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 파일에 저장할 수 없습니다."
+msgid "Cannot save to file \"{0}\"."
+msgstr "\"{0}\" 파일에 저장할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; 서명 스크립트를 설정할 수 없습니다."
+msgid "Cannot set signature script \"{0}\"."
+msgstr "\"{0}\" 서명 스크립트를 설정할 수 없습니다."
 
 #: ../mail/mail.error.xml.h:41
+msgid "Check Junk Failed"
+msgstr "정크메일 검사 실패"
+
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14610,46 +15366,42 @@ msgstr ""
 "암호를 정확히 입력해 주십시오.  보통 암호는 대소문자를 구별합니다. 지금 Caps "
 "Lock이 켜져 있을 수도 있습니다."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "서명 파일을 저장할 수 없습니다."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "&quot;{0}&quot;을(를) 지우시겠습니까?"
-
 #: ../mail/mail.error.xml.h:44
-msgid "Delete account?"
-msgstr "계정을 지우시겠습니까?"
+msgid "Delete \"{0}\"?"
+msgstr "\"{0}\"을(를) 지우시겠습니까?"
 
 #: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr "&quot;{0}&quot; 찾기 폴더 안의 메세지를 지우시겠습니까?"
+msgid "Delete account?"
+msgstr "계정을 지우시겠습니까?"
 
 #: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "\"{0}\" 찾기 폴더 안의 메세지를 지우시겠습니까?"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
 msgstr "찾기 폴더 안의 메세지를 지우시겠습니까?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "바뀐 내용을 버리시겠습니까?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "지우지 않기(_E)"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "지우지 않기"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "해제하지 않기"
 
-#: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "하위 폴더에서도 해당 작업을 수행하시겠습니까?"
-
 #: ../mail/mail.error.xml.h:52
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
@@ -14749,34 +15501,26 @@ msgid "Mark all messages as read"
 msgstr "모든 메세지를 읽은 것으로 표시합니다"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "이 폴더와 하위 폴더의 모든 메세지를 읽은 것으로 표시하시겠습니까?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "폴더가 빠졌습니다."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "소스를 선택하지 않았습니다."
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "현재 폴더에만(_C)"
-
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "여러 개의 메세지를 한꺼번에 열면 시간이 오래 걸릴 수도 있습니다."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "계정 설정을 확인하고 다시 시도해 보십시오."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "계정을 사용하도록 만들거나 다른 계정으로 보내 보십시오."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14784,7 +15528,7 @@ msgstr ""
 "\"받는 사람:\" 필드에 올바른 전자메일 주소를 입력하십시오. 입력창 옆의 \"받"
 "는 사람:\" 단추를 누르면 전자메일 주소를 찾을 수 있습니다."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14794,34 +15538,42 @@ msgstr ""
 "오:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "이 서명을 구분할 수 있는 고유한 이름을 입력하십시오."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "잠시 기다리십시오."
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "과거의 &quot;{0}&quot; 메일 폴더에서 옮겨오는 데 문제가 발생했습니다."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "과거의 \"{0}\" 메일 폴더에서 옮겨오는 데 문제가 발생했습니다."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "서버에 질의하는 중"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "서버에 지원하는 인증 방식 목록 물어보기."
 
 # read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "내용 읽음 확인을 요청했습니다."
 
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "정말로 \"{0}\" 폴더와 그 아래 폴더를 모두 지우시겠습니까?"
+
+#: ../mail/mail.error.xml.h:90
+msgid "Report Junk Failed"
+msgstr "정크메일 알림 실패"
+
 #: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "정말로 &quot;{0}&quot; 폴더와 그 아래 폴더를 모두 지우시겠습니까?"
+msgid "Report Not Junk Failed"
+msgstr "정크메일 아님 알림 실패"
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
@@ -14874,13 +15626,13 @@ msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "다음:\n"
 "{0}\n"
 "찾기 폴더는 다음 지워진 폴더를 사용합니다:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "업데이트했습니다."
 
 #: ../mail/mail.error.xml.h:106
@@ -14888,13 +15640,13 @@ msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "다음:\n"
 "{0}\n"
 "필터 규칙은 다음 지워진 폴더를 사용합니다:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "업데이트했습니다."
 
 #: ../mail/mail.error.xml.h:111
@@ -14907,7 +15659,7 @@ msgid ""
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 "이 폴더는 묵시적으로 더한 폴더일 수도 있습니다.\n"
-"필요하다면, 찾기 폴더 편집 창으로 가서 직접 더하십시오."
+"필요하다면, 찾기 폴더 편집 창으로 가서 직접 추가하십시오."
 
 #: ../mail/mail.error.xml.h:114
 msgid ""
@@ -15004,9 +15756,8 @@ msgstr ""
 "부를 선택할 수 있습니다."
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr ""
-"&quot;{0}&quot; 서버에 &quot;{0}&quot; 사용자로 로그인하는 데 실패했습니다."
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "\"{0}\" 서버에 \"{0}\" 사용자로 로그인하는 데 실패했습니다."
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -15028,78 +15779,91 @@ msgstr "비우기(_E)"
 msgid "_Open Messages"
 msgstr "메세지 열기(_O)"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "현재 폴더와 하위 폴더에(_S)"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "보지않았음"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "봤음"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "응답함"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1054
+msgid "Forwarded"
+msgstr "전달함"
+
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "여러개의 보지않은 메세지"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "여러 메세지"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "가장 낮음"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "낮음"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "높음"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "가장 높음"
 
 # ???
-#: ../mail/message-list.c:1614 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "오늘 %p %l:%M"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "어제 %p %l:%M "
 
-#: ../mail/message-list.c:1642 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "(%a) %p %l:%M"
 
-#: ../mail/message-list.c:1650 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %e일 %p %l:%M"
 
-#: ../mail/message-list.c:1652 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%Y년 %b %e일"
 
-#: ../mail/message-list.c:3849
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3885 ../mail/message-list.c:4321
 msgid "Generating message list"
 msgstr "메세지 목록 작성중"
 
+#: ../mail/message-list.c:4176
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"찾기 기준에 해당하는 메세지가 없습니다. 찾기->비우기 메뉴 항목으로 찾기를 지"
+"우거나 찾기 기준을 바꾸십시오."
+
+#: ../mail/message-list.c:4178
+msgid "There are no messages in this folder."
+msgstr "이 폴더에는 메세지가 없습니다."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "기한"
@@ -15129,39 +15893,39 @@ msgstr "보낸 메세지"
 msgid "Size"
 msgstr "크기"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "호출"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "전달하지 않음"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "추가 작업"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "유용한 정보"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "전달"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "회신이 필요 없음"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "회신"
 
-#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "전체 회신"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "다시 보기"
 
@@ -15199,33 +15963,22 @@ msgid "Provides core functionality for local address books."
 msgstr "로컬 주소록의 주요 기능을 제공합니다."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "첨부 알림 플러그인 사용"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "첨부 알림 플러그인 사용."
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
 msgstr "첨부 알림 플러그인이 메세지 본문에서 찾아볼 근거 목록"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
 msgstr "첨부 알림 플러그인이 메세지 본문에서 찾아볼 근거 목록."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "키워드"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "첨부 없음 알리기(_M)"
-
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
 msgid "Attachment Reminder"
@@ -15251,9 +16004,9 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "메세지에 첨부가 없습니다"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "편집 계속(_C)"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
+msgstr "메세지 편집(_E)"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
@@ -15267,27 +16020,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "오디오 인라인 플러그인"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:107
 msgid "Select name of the Evolution backup file"
 msgstr "에볼루션 백업 파일 이름 선택"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:136
 msgid "_Restart Evolution after backup"
 msgstr "백업한 다음에 에볼루션 다시 시작(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:159
 msgid "Select name of the Evolution backup file to restore"
 msgstr "복구할 에볼루션 백업 파일 이름 선택"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after restore"
 msgstr "복구한 다음에 에볼루션 다시 시작(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:256
 msgid "Restore from backup"
 msgstr "백업에서 복구"
 
-#: ../plugins/backup-restore/backup-restore.c:238
+#: ../plugins/backup-restore/backup-restore.c:258
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. \n"
@@ -15297,98 +16050,122 @@ msgstr ""
 "를 복구하실 수 있습니다. \n"
 "모든 개인 설정 사항, 메일 필터 기능 등도 복구합니다."
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restore Evolution from the backup file"
 msgstr "백업 백업 파일에서 에볼루션 복구(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:271
 msgid "Please select an Evolution Archive to restore:"
 msgstr "복구할 에볼루션 아카이브를 선택해 주십시오:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:274
 msgid "Choose a file to restore"
 msgstr "복구할 파일을 선택하십시오"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "에볼루션 디렉토리 백업"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "에볼루션 디렉토리 복구"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "에볼루션 백업 검사"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "에볼루션 다시 시작"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr "그래픽 사용자 인터페이스 사용"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "에볼루션을 종료하는 중입니다"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "에볼루션 계정 및 설정을 백업하는 중"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "에볼루션 데이터를 백업하는 중 (메일, 연락처, 달력, 작업, 메모)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "백업 완료"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "에볼루션 다시 시작하는 중"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "현재 에볼루션 데이터를 백업"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "백업에서 파일을 추출하는 중"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "에볼루션 설정을 읽어오는 중"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "임시 백업 파일을 삭제하는 중"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr "로컬 소스 확인하는 중"
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "%s 폴더에 백업하는 중"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "%s 폴더에서 복구하는 중"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "에볼루션 백업"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "에볼루션 복구"
 
+#: ../plugins/backup-restore/backup.c:494
+msgid "Backing up Evolution Data"
+msgstr "에볼루션 데이터를 백업하는 중입니다"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr "에볼루션에서 데이터를 백업하는 동안 잠시 기다리십시오."
+
+#: ../plugins/backup-restore/backup.c:497
+msgid "Restoring Evolution Data"
+msgstr "에볼루션 데이터를 복구하는 중입니다"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr "에볼루션에서 데이터를 복구하는 동안 잠시 기다리십시오."
+
+#: ../plugins/backup-restore/backup.c:516
+msgid "This may take a while depending on the amount of data in your account."
+msgstr "이 작업은 계정의 데이터 크기에 따라 시간이 걸릴 수도 있습니다."
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "에볼루션 데이터 및 설정을 백업하고 복구합니다."
+msgstr "에볼루션 데이터 및 설정을 백업하고 복구하는 플러그인."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
@@ -15416,14 +16193,22 @@ msgstr ""
 "로 실행하시고자 할 경우 토글 단추를 활성화합니다."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Insufficient Permissions"
+msgstr "권한이 없습니다"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "에볼루션 백업 파일이 잘못되었습니다"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "복구할 올바른 백업 파일을 선택하십시오."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "The selected folder does not have enough permissions to create the file"
+msgstr "선택한 폴더에서는 파일을 만들 권한이 없습니다"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
 "This will delete all your current Evolution data and settings and restore "
 "them from your backup. Evolution restore can start only when Evolution is "
@@ -15455,9 +16240,8 @@ msgstr "자동 연락처"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
-msgstr "메세지에 답장할 때 자동으로 주소록에 연락처 만들기(_A)"
+msgid "_Auto-create addressbook entries when replying to messages"
+msgstr "메세지에 답장하면 자동으로 주소록에 항목 만들기(_A)"
 
 #: ../plugins/bbdb/bbdb.c:571
 msgid "Select Address book for Automatic Contacts"
@@ -15469,10 +16253,8 @@ msgstr "인스턴스 메시지 연락처"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
-msgstr "피진 친구 목록의 나오는 정보 및 그림을 주기적으로 동기화"
+msgid "Synchronize contact info and images from Pidgin buddy list"
+msgstr "피진 친구 목록의 정보 및 그림을 동기화"
 
 #: ../plugins/bbdb/bbdb.c:607
 msgid "Select Address book for Pidgin buddy list"
@@ -15496,7 +16278,28 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr "%s 실행 중에 오류가 발생했습니다: %s."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr "보고필터 하위 프로세스가 응답하지 않습니다. 강제로 끝냅니다..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr "보고필터 하위 프로세스 대기가 중지되었습니다. 강제로 끝냅니다..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr "보고필터에 대한 파이프가 실패했습니다. 오류 코드: %d."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr "메세지 텍스트를 유니코드로 변환(_U)"
 
@@ -15517,6 +16320,10 @@ msgid "Bogofilter Options"
 msgstr "보고필터 옵션"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "보고필터 정크메일 플러그인"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "보고필터를 사용해 정크 메세지를 필터링합니다."
 
@@ -15525,12 +16332,12 @@ msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:135
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:351
+#: ../plugins/google-account-setup/google-source.c:357
 msgid "Use _SSL"
 msgstr "SSL 사용(_S)"
 
@@ -15550,17 +16357,17 @@ msgstr "로컬 달력"
 msgid "Provides core functionality for local calendars."
 msgstr "로컬 달력의 주요 기능을 제공합니다."
 
-#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:375
-msgid "_Refresh:"
-msgstr "새로 고침(_R):"
+#: ../plugins/google-account-setup/google-source.c:381
+msgid "Re_fresh:"
+msgstr "새로 고침(_F):"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "보안 연결(_S):"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "사용자이름(_M):"
 
@@ -15657,14 +16464,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "에볼루션을 기본 전자메일 프로그램으로 하시겠습니까?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:626
+#: ../shell/main.c:679
 msgid "Evolution"
 msgstr "에볼루션"
 
 #: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "기본 폴더로 표시(_D)"
+msgid "Mark as _default address book"
+msgstr "기본 주소록으로 표시(_D)"
+
+#: ../plugins/default-source/default-source.c:102
+msgid "Mark as _default calendar"
+msgstr "기본 달력으로 표시(_D)"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default task list"
+msgstr "기본 작업 목록으로 표시(_D)"
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default memo list"
+msgstr "기본 메모 목록으로 표시(_D)"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -15676,6 +16494,55 @@ msgid ""
 "default one."
 msgstr "달력이나 주소록을 기본값으로 지정하는 기능을 제공합니다."
 
+#: ../plugins/email-custom-header/email-custom-header.c:562
+msgid "_Custom Header"
+msgstr "사용자 설정 헤더(_C)"
+
+#: ../plugins/email-custom-header/email-custom-header.c:883
+msgid "Key"
+msgstr "키"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "값"
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+"사용자 설정 헤더 값을 지정하는 형식은:\n"
+"사용자 설정 헤더의 키와 값을 \";\"으로 구분합니다."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr "전자메일 사용자 설정 헤더"
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Adds custom header to outgoing messages."
+msgstr "보내는 메세지에 사용자 설정 헤더를 추가합니다."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "사용자 설정 헤더"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Header"
+msgstr "사용자 설정 헤더 목록"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"이 키는 보내는 메세지에 추가할 사용자 설정 헤더의 목록입니다. 헤더와 헤더 값"
+"을 지정하는 방법은 다음과 같습니다: 사용자 설정 헤더의 이름 다음에 \"=\" 다음"
+"에 값을 쓰고 \";\"으로 구분."
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "다른 사용자 폴더 열기"
@@ -15693,34 +16560,34 @@ msgid "_User:"
 msgstr "사용자(_U):"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "보안 암호"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr ""
 "이 옵션을 켜면 보안 암호 (NTLM) 인증을 사용해 익스체인지 서버에 연결합니다."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "일반 암호"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr ""
 "이 옵션을 켜면 일반 텍스트 암호 인증을 사용해 익스체인지 서버에 연결합니다."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "부재 중"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -15728,77 +16595,81 @@ msgstr ""
 "아래에 지정한 메세지는 부재 중에 메일을 보낸 각 사람들에게\n"
 "자동으로 전달합니다."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "현재 외부에 있음"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "현재 내부에 있음"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
-msgstr "Exchange 계정의 암호 바꾸기"
+msgstr "익스체인지 계정의 암호 바꾸기"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "암호 바꾸기"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
-msgstr "Exchange 계정의 대리인 설정을 관리합니다"
+msgstr "익스체인지 계정의 대리인 설정을 관리합니다"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "대리인 도우미"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "기타"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
-msgstr "모든 Exchange 폴더의 크기 보기"
+msgstr "모든 익스체인지 폴더의 크기 보기"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "폴더 크기"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
-msgstr "Exchange 설정"
+msgstr "익스체인지 설정"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:674
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:700
 msgid "A_uthenticate"
 msgstr "인증(_U)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:721
+msgid "_Mailbox:"
+msgstr "메일함(_M):"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:922
 msgid "_Authentication Type"
 msgstr "인증 방법(_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "Ch_eck for Supported Types"
 msgstr "지원하는 방법인지 확인(_E) "
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1048
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:1050
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -15816,13 +16687,13 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
+#: ../plugins/exchange-operations/exchange-change-password.c:113
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
 msgstr "현재 암호가 계정의 암호와 맞지 않습니다. 올바른 암호를 입력하십시오"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:120
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "두 암호가 맞지 않습니다. 암호를 다시 입력하십시오."
 
@@ -15847,33 +16718,33 @@ msgstr "현재의 암호가 사용 만료되었습니다. 지금 암호를 바�
 msgid "Your password will expire in the next %d days"
 msgstr "암호가 앞으로 %d일 안에 만료됩니다."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
 msgid "Custom"
 msgstr "사용자 설정"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "편집자 (읽기, 만들기, 편집)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "저자 (읽기, 만들기)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "검토자 (읽기전용)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "대리 권한"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s에 대한 권한"
@@ -15881,7 +16752,7 @@ msgstr "%s에 대한 권한"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -15891,66 +16762,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 msgid "You have been given the following permissions on my folders:"
 msgstr "내 폴더에 다음과 같은 권한을 부여 받았습니다:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
 msgstr "내 개인 항목을 볼 수 있습니다."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr "하지만 내 개인 항목은 볼 수 없습니다."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "귀하는 %s의 대리인으로 지정되었습니다"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To"
 msgstr "대리"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:580
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "대리인 %s을(를) 지우시겠습니까?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "액티브 디렉토리에 접근할 수 없습니다"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "액티브 디렉토리에서 자신을 찾을 수 없습니다"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "액티브 디렉토리에서 %s 대리를 찾을 수 없습니다"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "%s 대리를 지울 수 없습니다"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "대리 목록을 업데이트할 수 없습니다."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "%s 대리를 더할 수 없습니다"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:981
 msgid "Error reading delegates list."
 msgstr "대리 목록을 읽어들이는 데 오류."
 
@@ -15998,42 +16869,47 @@ msgstr "권한 요약(_S)"
 msgid "_Tasks:"
 msgstr "작업(_T):"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:59
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "권한..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
 msgid "Folder Name"
 msgstr "폴더 이름"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
 msgid "Folder Size"
 msgstr "폴더 크기"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+msgid "User"
+msgstr "사용자"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "다른 사용자의 폴더에 구독"
 
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
-msgstr "Exchange 폴더 트리"
+msgstr "익스체인지 폴더 트리"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:235
-#: ../plugins/exchange-operations/exchange-folder.c:245
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:234
+#: ../plugins/exchange-operations/exchange-folder.c:244
 msgid "Unsubscribe Folder..."
 msgstr "폴더 구독 해제..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:519
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "정말로 \"%s\" 폴더를 구독 해제하시겠습니까?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:531
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\"에서 구독 해제"
@@ -16097,15 +16973,18 @@ msgstr "암호가 7일 안에 만료됩니다..."
 msgid "_Change Password"
 msgstr "암호 바꾸기(_C)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(권한이 거부되었습니다.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
 msgid "Add User:"
 msgstr "사용자 추가:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../plugins/groupwise-features/proxy.c:934
+#: ../plugins/groupwise-features/share-folder.c:715
 msgid "Add User"
 msgstr "사용자 추가"
 
@@ -16229,11 +17108,11 @@ msgstr "사용자(_U)"
 msgid "button-user"
 msgstr "단추-사용자"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "사용자 선택"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "주소록..."
 
@@ -16247,9 +17126,9 @@ msgstr "다른 사용자의 달력 구독"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
 msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
+"A plugin that manages a collection of Exchange account specific operations "
 "and features."
-msgstr "익스체인지 계정에 관계된 동작이나 기능들을 처리하는 플러그인."
+msgstr "익스체인지 계정 관련 동작이나 기능들을 관리하는 플러그인."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -16338,10 +17217,14 @@ msgid "Could not update out-of-office state"
 msgstr "부재중 상태를 업데이트할 수 없습니다"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr "구독 사용자의 메일함을 읽어들이려면 에볼루션을 다시 시작해야 합니다"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "익스체인지 계정이 오프라인입니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16363,38 +17246,38 @@ msgstr ""
 "이 기능을 사용하도록 만들어야 에볼루션 익스체인지\n"
 "커넥터를 사용할 수 있습니다.\n"
 "\n"
-"익스체인지 관리자에게 보여줄 정보는, 아래의\n"
+"익스체인지 관리자에게 보여줄 정보는 아래의\n"
 "링크를 참고하십시오:\n"
 "\n"
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "대리자를 업데이트하는 데 실패했습니다:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "폴더가 이미 있습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "폴더가 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "폴더 오프라인"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "일반 오류"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "Global Catalog 서버에 연결할 수 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -16402,72 +17285,72 @@ msgstr ""
 "다른 경로에서 OWA가 실행하고 있다면, 계정 설정 대화 상자에서 그 경로를 지정해"
 "야 합니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "{0}에 대한 메일 박스는 이 서버에 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "URL이 올바른 지 확인하시고 다시 시도하십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "서버 이름의 철자가 맞는 지 확인하시고 다시 시도하십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr "사용자 이름과 암호가 올바른 지 확인하시고 다시 시도하십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "이 계정에서 Global Catalog 서버를 설정하지 않았습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "{0} 사용자의 메일박스가 {1}에 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "{0} 사용자가 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "암호를 성공적으로 바꿨습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 "대리인의 ID를 입력하거나 대리인 자격으로 보내기 옵션을 사용하지 마십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Global Catalog 서버 이름이 올바른지 확인하십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "바뀐 사항을 적용하려면 에볼루션을 다시 시작해 주십시오"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "사용자를 선택하십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "암호가 너무 취약하기 때문에 서버에서 거부했습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "에볼루션을 끝내면 익스체인지 계정을 사용하지 않게 됩니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "에볼루션을 끝내면 익스체인지 계정을 지우게 됩니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "이 익스체인지 서버는 익스체인지 커넥터와 호환되지 않습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -16475,7 +17358,7 @@ msgstr ""
 "서버가 익스체인지 5.5를 실행하고 있습니다. 익스체인지 커넥터는\n"
 "마이크로소프트 익스체인지 2000 및 2003만 지원합니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -16489,69 +17372,69 @@ msgstr ""
 "\n"
 "아니면 단순히 암호를 잘못 입력했을 수도 있습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "다른 암호로 다시 시도해 보십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "사용자를 접근권한 컨트롤 목록에 더할 수 없습니다:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "대리인을 편집할 수 없습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "{0}을(를) 찾아보는 데 알 수 없는 오류"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error."
 msgstr "알 수 없는 오류."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "알 수 없는 종류"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "지원하지 않는 동작"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
-msgstr "이 서버에서 사용할 수 있는 메일 저장 한계 용량에 가까워져 있습니다."
+msgstr "이 서버에서 사용할 수 있는 메일 저장 제한 용량에 가까워져 있습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr "한번에 한 명의 대리인을 통해서만 메세지를 보낼 수 있습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "자기 자신을 자신의 대리인으로 만들 수 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "이 서버에 메일을 저장할 수 있는 제한 용량을 넘어갔습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "한 개의 익스체인지 계정만 설정할 수 있습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr "현재 사용량은: {0}KB입니다. 메일을 지워서 공간을 더 확보해 보십시오."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr "현재 사용량은: {0}KB입니다. 현재 메일을 보내거나 받지 못할 것입니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -16559,19 +17442,19 @@ msgstr ""
 "현재 사용량은: {0}KB입니다. 메일을 지워서 공간을 더 확보하지 않으면 메일을 보"
 "내지 못할 것입니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "암호가 만료되었습니다."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0}을(를) 접근 권한 조정 목록에 더할 수 없습니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0}은(는) 이미 대리인입니다"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0}은(는) 이미 목록에 있습니다"
 
@@ -16583,6 +17466,14 @@ msgstr "다른 사용자의 작업에 구독"
 msgid "Check folder permissions"
 msgstr "폴더 권한 검사"
 
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "기본 외부 편집기"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr "편집기로 사용할 기본 명령어."
+
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
 "A plugin for using an external editor as the composer. You can send only "
@@ -16596,6 +17487,28 @@ msgstr ""
 msgid "External Editor"
 msgstr "외부 편집기"
 
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "임시 파일을 만들 수 없습니다"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr "편집기를 시작할 수 없습니다"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr "메일을 저장할 임시 파일을 만들 수 없습니다. 나중에 다시 시도하십시오."
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"플러그인 기본 설정에서 지정한 외부 편지기를 실행할 수 없습니다. 다른 편집기"
+"를 설정해 보십시오."
+
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
 msgid "Compose in External Editor"
 msgstr "외부 편집기에서 작성"
@@ -16604,15 +17517,27 @@ msgstr "외부 편집기에서 작성"
 msgid "Compose messages using an external editor"
 msgstr "외부 편집기를 사용해 메세지 작성"
 
-#: ../plugins/face/face.c:57
+#: ../plugins/external-editor/external-editor.c:91
+msgid "Command to be executed to launch the editor: "
+msgstr "편집기를 실행할 명령어: "
+
+#: ../plugins/external-editor/external-editor.c:92
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+"이맥스의 경우 \"xemacs\"를 사용하고\n"
+"VI는 \"gvim\"을 사용하십시오"
+
+#: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "크기가 700바이트보다 작은 (48*48) PNG를 고르십시오"
 
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:68
 msgid "PNG files"
 msgstr "PNG 파일"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:125
 msgid "_Face"
 msgstr "얼굴(_F)"
 
@@ -16647,20 +17572,37 @@ msgstr "폴더 구독 해제"
 msgid "_Unsubscribe"
 msgstr "구독 중지(_U)"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:73
+#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "구글"
 
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+msgid "<b>Server</b>"
+msgstr "<b>서버</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+msgid "Username:"
+msgstr "사용자 이름:"
+
+# FIXME - hard to translate UI + string based on English grammar
+# "Update every" <spinbox> "seconds"
+#: ../plugins/google-account-setup/google-contacts-source.c:230
+msgid "Update every"
+msgstr "업데이트 주기: "
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "구글 달력 소스를 설정하는 플러그인."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "구글 달력 및 연락처를 설정하는 플러그인."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "구글 소스"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
 msgstr "확인목록"
 
@@ -16740,23 +17682,29 @@ msgid "_Junk List"
 msgstr "정크메일 목록(_J)"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr "메세지 철회"
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+"메세지를 철회하면 받은 사람 메일함에서 지워질 수 있습니다. 정말로 철회하시겠"
+"습니까?"
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
-msgstr "메세지를 성공적으로 가져왔습니다"
+msgstr "메세지를 성공적으로 철회했습니다"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
-msgstr "메일 가져오기"
+msgstr "메일 철회"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr "그룹와이즈 메세지에 보내기 옵션 추가"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "보내기 옵션"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "그룹와이즈 계정 기능에 대한 플러그인."
@@ -16765,6 +17713,73 @@ msgstr "그룹와이즈 계정 기능에 대한 플러그인."
 msgid "Groupwise Features"
 msgstr "그룹웨어 기능"
 
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+msgid "Message retract failed"
+msgstr "메세지 철회가 실패했습니다"
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+msgid "The server did not allow the selected message to be retracted."
+msgstr "선택한 메세지의 철회를 서버에서 허용하지 않았습니다."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+msgid "Invalid user"
+msgstr "잘못된 사용자"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "프록시 권한을 &quot;{0}&quot; 사용자에게 부여할 수 없습니다"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+msgid "Specify User"
+msgstr "사용자 지정"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+msgid "You have already given proxy permissions to this user."
+msgstr "이 사용자에게 이미 프록시 권한을 부여했습니다."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr "프록시 권한을 부여하려면 올바른 사용자 이름을 지정해야 합니다."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "&quot;{0}&quot; 계정이 이미 있습니다. 폴더 트리를 확인하십시오."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+msgid "Account Already Exists"
+msgstr "계정이 이미 있습니다"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
+"try again."
+msgstr ""
+"&quot;{0}&quot; 사용자의 프록시 로그인이 실패했습니다. 전자메일 ID를 확인하"
+"고 다시 시도하십시오."
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr "반복 모임입니다"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+msgid "Would you like to accept it?"
+msgstr "받아들이시겠습니까?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "Would you like to decline it?"
+msgstr "거부하시겠습니까?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "폴더를 지정한 &quot;{0}&quot; 사용자와 공유할 수 없습니다"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+msgid "You have to specify a user name whom you want to add to the list"
+msgstr "목록에 추가할 사용자 이름을 지정해야 합니다"
+
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
 msgstr "시험 삼아 허용"
@@ -16864,9 +17879,9 @@ msgstr "<b>계정 이름</b>"
 msgid "Proxy Login"
 msgstr "프록시 로그인"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -16875,20 +17890,20 @@ msgstr "%s%s(사용자 %s)의 암호를 입력하십시오"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:521
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "프록시 로그인(_P)..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "해당 계정이 온라인 상태일 경우에만 프록시 탭을 사용할 수 있습니다."
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "해당 계정을 사용할 경우에만 프록시 탭을 사용할 수 있습니다."
 
 #: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "사용자"
 
@@ -16904,11 +17919,15 @@ msgstr "새 공유 폴더(_S)..."
 msgid "Sharing"
 msgstr "공유"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "사용자 지정 알림"
+
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "추가   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "바꾸기"
 
@@ -16953,7 +17972,6 @@ msgstr "지움: "
 msgid "Declined: "
 msgstr "거부: "
 
-# FIXME - hard to translate UI + string based on English grammar
 #: ../plugins/groupwise-features/status-track.c:220
 msgid "Completed: "
 msgstr "완료: "
@@ -16974,11 +17992,11 @@ msgstr "hula 달력 소스를 설정하는 플러그인."
 msgid "Hula Account Setup"
 msgstr "Hula 계정 설정"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "사용자 설정 헤더"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP 헤더"
 
@@ -17031,28 +18049,28 @@ msgstr "IMAP 계정 기능에 대한 플러그인."
 msgid "IMAP Features"
 msgstr "IMAP 기능"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "달력으로 가져오기(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "작업으로 가져오기(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "ICS 가져오기"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "작업 목록 선택"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "달력 선택"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:263
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../shell/e-shell-importer.c:700
 msgid "_Import"
 msgstr "가져오기(_I)"
 
@@ -17090,8 +18108,8 @@ msgstr ""
 "동기화할 아이팟을 에볼루션에서 찾을 수 없습니다. 아이팟이 시스템에 연결이 되"
 "지 않았거나 전원이 꺼져 있습니다."
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar 형식 (.ics)"
 
@@ -17144,92 +18162,92 @@ msgstr "어느 메모 목록에서도 이 메모를 찾을 수 없습니다"
 msgid "Searching for an existing version of this appointment"
 msgstr "이 약속의 현재 버전을 찾는 중입니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:943
+#: ../plugins/itip-formatter/itip-formatter.c:946
 msgid "Unable to parse item"
 msgstr "항목을 파싱할 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1004
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "항목을 '%s' 달력에 보낼 수 없습니다.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1013
+#: ../plugins/itip-formatter/itip-formatter.c:1016
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "'%s' 달력에 수락이라고 보냄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "'%s' 달력에 미정이라고 보냄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1022
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "'%s' 달력에 거절이라고 보냄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1027
+#: ../plugins/itip-formatter/itip-formatter.c:1030
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "'%s' 달력에 취소라고 보냄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1121
+#: ../plugins/itip-formatter/itip-formatter.c:1124
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "주최자가 대리인 %s을(를) 지웠습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1131
 msgid "Sent a cancelation notice to the delegate"
 msgstr "대리인에게 취소 공지를 보냈습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "대리인에게 취소 공지를 보낼 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1219
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "잘못된 상태때문에 참석자 상태를 업데이트할 수 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1243
+#: ../plugins/itip-formatter/itip-formatter.c:1246
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "참석자를 업데이트할 수 없습니다. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1247
+#: ../plugins/itip-formatter/itip-formatter.c:1250
 msgid "Attendee status updated"
 msgstr "참석자 상태를 업데이트했습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1276
 msgid "Meeting information sent"
 msgstr "모임 정보를 보냈습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid "Task information sent"
 msgstr "작업 정보를 보냈습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1282
 msgid "Memo information sent"
 msgstr "메모 정보를 보냈습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1288
+#: ../plugins/itip-formatter/itip-formatter.c:1291
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "모임 정보를 보낼 수 없습니다. 해당 모임이 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1294
 msgid "Unable to send task information, the task does not exist"
 msgstr "작업 정보를 보낼 수 없습니다. 해당 작업이 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1297
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "메모 정보를 보낼 수 없습니다. 해당 메모가 없습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1369
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid "The calendar attached is not valid"
 msgstr "첨부한 달력이 잘못되었습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1370
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../plugins/itip-formatter/itip-formatter.c:1367
+#: ../plugins/itip-formatter/itip-formatter.c:1378
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17237,16 +18255,16 @@ msgstr ""
 "메세지에 달력이 들어 있다고 되어 있으나, 그 달력이 올바른 iCalendar가 아닙니"
 "다."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1420
-#: ../plugins/itip-formatter/itip-formatter.c:1438
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "The item in the calendar is not valid"
 msgstr "달력 안이 항목이 올바르지 않습니다"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-#: ../plugins/itip-formatter/itip-formatter.c:1439
-#: ../plugins/itip-formatter/itip-formatter.c:1521
+#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1437
+#: ../plugins/itip-formatter/itip-formatter.c:1519
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17254,325 +18272,325 @@ msgstr ""
 "메세지에 달력이 들어 있으나, 달력에 행사, 작업, 약속 있음/없음 정보가 하나도 "
 "들어 있지 않습니다."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1450
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "The calendar attached contains multiple items"
 msgstr "첨부한 달력에 여러 개의 항목이 들어 있습니다"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "이 항목을 모두 처리하려면, 파일을 저장해서 그 달력을 가져와야 합니다."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "이 약속 반복"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "이 작업 반복"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "이 메모 반복"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2369
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "적용한 다음에 메세지 지우기(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2379
-#: ../plugins/itip-formatter/itip-formatter.c:2411
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "충돌 찾기"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "충돌하는 모임을 찾을 달력을 선택하십시오"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "오늘"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:195
 msgid "Today %H:%M"
 msgstr "오늘 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:199
 msgid "Today %H:%M:%S"
 msgstr "오늘 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:208
 msgid "Today %l:%M:%S %p"
 msgstr "오늘 %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:218
 msgid "Tomorrow"
 msgstr "내일"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow %H:%M"
 msgstr "오늘 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:227
 msgid "Tomorrow %H:%M:%S"
 msgstr "오늘 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %l:%M %p"
 msgstr "내일 %p %l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:236
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "내일 %p %l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../plugins/itip-formatter/itip-view.c:255
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:260
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:266
+#: ../plugins/itip-formatter/itip-view.c:264
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %l:%M %p"
 msgstr "%A %p %l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:275
+#: ../plugins/itip-formatter/itip-view.c:273
 msgid "%A %l:%M:%S %p"
 msgstr "%A %p %l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:284
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e"
 msgstr "%B %e일 %A"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:288
 msgid "%A, %B %e %H:%M"
 msgstr "%B %e일 %A, %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:292
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%B %e일 %A, %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %l:%M %p"
 msgstr "%B %e일 %A, %p %l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%B %e일 %A, %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:307
 msgid "%A, %B %e, %Y"
 msgstr "%Y년 %B %e일 %A"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y년 %B %e일 %A, %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:316
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y년 %B %e일 %A, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y년 %B %e일 %A, %p %l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:325
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y년 %B %e일 %A, %p %l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:526
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "<b>%s</b> 자격으로 응답하십시오."
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "<b>%s</b> 자격으로 받음"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:357
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 모임 정보를 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:359
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b>님이 다음 모임 정보를 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b>님이 다음 모임을 위임했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 모임에 참석하시기를 요청했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b>님이 다음 모임에 참석하시기를 요청했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:375
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 기존 모임에 참석하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:377
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b>님이 기존 모임에 참석하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 모임의 최신 정보를 받고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b>님이 다음 모임의 최신 정보를 받고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:387
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음과 같은 모임 응답을 보냈습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:389
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b>님이 다음과 같은 모임 응답을 보냈습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:393
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 모임을 취소했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:395
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b>님이 다음 모임을 취소했습니다."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:399
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 모임 변경을 제안했습니다."
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:401
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b>님이 다음 모임 변경을 제안했습니다."
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:405
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 모임 변경을 거절했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:407
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b>님이 다음 모임 변경을 거절했습니다."
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:445
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 작업을 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b>님이 다음 작업을 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b>님이 다음 작업에 %s님의 할당을 요청했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:455
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 작업을 할당했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b>님이 작업을 할당했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:463
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 기존 작업에 참여하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:465
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b>님이 기존 작업에 참여하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17580,7 +18598,7 @@ msgid ""
 msgstr ""
 "<b>%s</b>님이 %s을(를) 통해 다음 작업 할당의 최근 정보를 받고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:471
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -17588,129 +18606,129 @@ msgid ""
 msgstr "<b>%s</b>님이 다음 작업 할당의 최근 정보를 받고 싶어합니다:"
 
 # FIXME: through what?
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:475
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 작업 할당 응답을 보냈습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:477
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b>님이 다음 작업 할당 응답을 보냈습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:481
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 할당 작업을 취소했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:483
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b>님이 다음 할당 작업을 취소했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:487
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 작업 할당 변경을 제안했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:489
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b>님이 다음 작업 할당 변경을 제안했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:493
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 작업 할당을 거절했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:495
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b>님이 다음 작업 할당을 거절했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:533
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 메모를 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b>님이 다음 메모를 게시했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:540
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b>님이 %s을(를) 통해 기존 메모에 내용을 더하고 싶어합니다:"
+msgstr "<b>%s</b>님이 %s을(를) 통해 기존 메모에 내용을 추가하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b>님이 기존 메모에 내용을 더하고 싶어합니다:"
+msgstr "<b>%s</b>님이 기존 메모에 내용을 추가하고 싶어합니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b>님이 %s을(를) 통해 다음 공유 메모를 취소했습니다:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b>님이 다음 공유 메모를 취소했습니다:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:819
 msgid "_Open Calendar"
 msgstr "달력 열기(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:852
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Decline"
 msgstr "거부(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:826
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Accept"
 msgstr "허용(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Decline all"
 msgstr "모두 거부(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Tentative all"
 msgstr "모두 잠정적(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:836
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Tentative"
 msgstr "잠정적(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Accept all"
 msgstr "모두 허용(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Send Information"
 msgstr "정보 보내기(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Update Attendee Status"
 msgstr "참석자 상태 업데이트(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:849
 msgid "_Update"
 msgstr "업데이트(_U)"
 
@@ -17767,7 +18785,7 @@ msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
 "&quot;{1}&quot;?"
 msgstr ""
-"&quot;{0}&quot;이(가) 모임을 위임했습니다. {1} 대리인을 더하시겠습니까?"
+"&quot;{0}&quot;이(가) 모임을 위임했습니다. {1} 대리인을 추가하시겠습니까?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -17776,7 +18794,8 @@ msgstr "이 모임은 위임되었습니다"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
-msgstr "현재 참석자가 아닌 사람이 이 회신을 했습니다. 참석자로 더하시겠습니까?"
+msgstr ""
+"현재 참석자가 아닌 사람이 이 회신을 했습니다. 참석자로 추가하시겠습니까?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
 msgid "Proxy _Logout"
@@ -17857,12 +18876,20 @@ msgstr "아이콘을 깜박일 지 여부."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "받은 편지함 폴더에만 새 메세지를 알릴 지 여부."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "D-Bus 메세지 보내기(_D)"
 
+#: ../plugins/mail-notification/mail-notification.c:361
+msgid "Evolution's Mail Notification"
+msgstr "에볼루션 메일 알림"
+
+#: ../plugins/mail-notification/mail-notification.c:382
+msgid "Mail Notification Properties"
+msgstr "메일 알림 속성"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:440
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17874,54 +18901,54 @@ msgstr[0] ""
 "새로 %d개의 메세지를 받았습니다.\n"
 "(%s 폴더)"
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:445
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "새로 %d개의 메세지를 받았습니다."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:462
 msgid "New email"
 msgstr "새 메일"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:519
 msgid "Show icon in _notification area"
 msgstr "알림 영역에서 아이콘 표시(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:522
 msgid "B_link icon in notification area"
 msgstr "알림 영역에서 아이콘 깜박이기(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:524
 msgid "Popup _message together with the icon"
 msgstr "아이콘과 같이 메세지 팝업 표시(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:705
 msgid "_Play sound when new messages arrive"
 msgstr "새 메세지가 도착하면 사운드 재생(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:711
 msgid "_Beep"
 msgstr "삑 소리(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:712
 msgid "Play _sound file"
 msgstr "사운드 파일 재생(_S)"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:723
 msgid "Specify _filename:"
 msgstr "파일 이름 지정(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:724
 msgid "Select sound file"
 msgstr "사운드 파일을 고르십시오"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:725
 msgid "Pl_ay"
 msgstr "재생(_A)"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:782
 msgid "Notify new messages for _Inbox only"
 msgstr "받은 편지함의 경우에만 새 메세지 알림(_I)"
 
@@ -18065,12 +19092,12 @@ msgstr "메일링 리스트로 전자메일을 보내시겠습니까?"
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"해당 동작을 수행할 수 없습니다. 해당 헤더에 처리할 수 있는 동작이 들어 있지 "
-"않습니다.\n"
+"해당 동작을 수행할 수 없습니다. 해당 동작에 대한 헤더에 처리할 수 있는 동작"
+"이 들어 있지 않습니다.\n"
 "\n"
 "헤더: {0}"
 
@@ -18146,6 +19173,26 @@ msgstr "리스트에 가입(_S)"
 msgid "_Unsubscribe from List"
 msgstr "리스트에서 탈퇴(_U)"
 
+#: ../plugins/mark-all-read/mark-all-read.c:37
+msgid "Mark all messages in this folder and subfolders as read?"
+msgstr "이 폴더와 하위 폴더의 모든 메세지를 읽은 것으로 표시하시겠습니까?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+msgid "Do you want the operation to be performed also in the subfolders?"
+msgstr "하위 폴더에서도 해당 작업을 수행하시겠습니까?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:85
+msgid "Mark All Messages as Read"
+msgstr "모든 메세지를 읽은 것으로 표시"
+
+#: ../plugins/mark-all-read/mark-all-read.c:162
+msgid "Current Folder and _Subfolders"
+msgstr "현재 폴더와 하위 폴더(_S)"
+
+#: ../plugins/mark-all-read/mark-all-read.c:174
+msgid "Current _Folder Only"
+msgstr "현재 폴더만(_F)"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "모두 읽은 것으로 표시"
@@ -18176,11 +19223,11 @@ msgstr "오프라인에서 사용할 수 있게 하기(_M)"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
-msgstr "Mono 플러그인을 구현하는 플러그인."
+msgstr "모노 플러그인을 구현하는 플러그인."
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
-msgstr "Mono 로더"
+msgstr "모노 로더"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
@@ -18188,7 +19235,7 @@ msgstr "어느 플러그인을 사용하고 사용하지 않을 지 관리하는
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "플러그인 관리자"
 
@@ -18200,33 +19247,24 @@ msgstr "플러그인 사용 여부"
 msgid "_Plugins"
 msgstr "플러그인(_P)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:42
 msgid "Author(s)"
 msgstr "개발자"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "설명"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "설정"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "주의: 일부 바뀐 사항은 다시 시작해야 적용됩니다"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
 msgstr "개요"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "설정"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "이 플러그인은 설정 옵션이 없습니다."
-
-#: ../plugins/plugin-manager/plugin-manager.c:330
-#: ../plugins/plugin-manager/plugin-manager.c:392
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "플러그인"
 
@@ -18250,41 +19288,22 @@ msgstr "일반 텍스트 모드"
 msgid "Prefer plain-text"
 msgstr "일반 텍스트 선호"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
 msgstr "HTML이 있으면 표시"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
 msgstr "일반 텍스트 선호"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:176
 msgid "Only ever show PLAIN"
 msgstr "일반 텍스트만 표시"
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:219
 msgid "HTML _Mode"
 msgstr "HTML 모드(_M)"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr "편지 작성에서 인쇄할 수 있는 옵션 사용."
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "메세지 인쇄"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "인쇄 미리 보기(_V)"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "메세지를 인쇄합니다"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "에볼루션 프로파일러"
@@ -18309,13 +19328,7 @@ msgstr "위치"
 msgid "_Publish Calendar Information"
 msgstr "달력 정보 게시(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "`%s'의 암호를 입력하십시오"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "정말로 이 URL을 지우시겠습니까?"
 
@@ -18405,15 +19418,75 @@ msgstr ""
 "iCal\n"
 "약속 있음/없음"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "헬로 파이썬"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "파이썬 플러그인 로더 테스트"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "파이썬 테스트 플러그인"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "파이썬 EPlugin 로더 테스트 플러그인."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr "파이썬으로 작성한 다른 플러그인을 읽어들이는 플러그인."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "파이썬 로더"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "스팸어새신 (내부에 포함)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
-msgid "This will make Spamassasin more reliable, but slower"
-msgstr "이렇게 하면 스팸어새신이 더욱 잘 작동하지만, 훨씬 더 느립니다"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "스팸어새신이 없습니다. 코드: %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, c-format
+msgid "Failed to create pipe: %s"
+msgstr "파이프를 만드는 데 실패했습니다: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, c-format
+msgid "Error after fork: %s"
+msgstr "프로세스 만든 뒤에 오류: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr "스팸어새신 하위 프로세스가 응답하지 않습니다. 강제로 끝냅니다..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr "스팸어새신 하위 프로세스 대기가 중지되었습니다. 강제로 끝냅니다..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr "스팸어새신에 대한 파이프가 실패했습니다. 오류 코드: %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr "스팸어새신을 사용할 수 없습니다."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr "이렇게 하면 스팸어새신이 더 안정적으로 작동하지만, 더 느립니다"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "원격 테스트 포함(_N)"
 
@@ -18439,7 +19512,7 @@ msgstr "메세지의 모든 첨부물이나 그 일부를 한 번에 저장하�
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:330
+#: ../plugins/save-attachments/save-attachments.c:314
 msgid "Save attachments"
 msgstr "첨부 저장"
 
@@ -18451,16 +19524,15 @@ msgstr "첨부 저장..."
 msgid "Save all attachments"
 msgstr "모든 첨부 저장"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "저장할 위치 선택"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "MIME 형식"
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "저장"
 
@@ -18468,79 +19540,79 @@ msgstr "저장"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:167
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "설명 목록"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "분류 목록"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "메모 목록"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "만듦"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "연락처 목록"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "시작"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "끝"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "퍼센트 완료"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "참석자 목록"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "바뀜"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "CSV 형식의 고급 옵션"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "앞에 헤더 붙임"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "값 구분:"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "레코드 구분:"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "값을 둘러싸는 문자:"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "콤마로 구분한 값 형식 (.csv)"
 
@@ -18561,15 +19633,15 @@ msgstr "디스크에 저장(_S)"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:154
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "RDF 형식 (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "대상 파일 선택"
 
@@ -18594,8 +19666,8 @@ msgid "Show _only this Task List"
 msgstr "이 작업 목록만 표시(_O)"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
-msgstr "시작 마법사를 처리하는 플러그인."
+msgid "A plugin that manages the Startup wizard."
+msgstr "시작 마법사를 관리하는 플러그인."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 msgid "Startup wizard"
@@ -18627,24 +19699,24 @@ msgid "Importing files"
 msgstr "파일 가져오기"
 
 #: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:144
 msgid "Please select the information that you would like to import:"
 msgstr "다음에서 가져오고 싶은 정보를 선택하십시오:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../shell/e-shell-importer.c:397
 #, c-format
 msgid "From %s:"
 msgstr "%s에서:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../shell/e-shell-importer.c:508
 #, c-format
 msgid "Importing data."
 msgstr "데이터를 가져오는 중입니다."
 
 #: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../shell/e-shell-importer.c:522
 msgid "Please wait"
 msgstr "잠시 기다리십시오"
 
@@ -18667,6 +19739,28 @@ msgstr "제목에 따라 메세지를 글타래로 표시합니다"
 msgid "F_all back to threading messages by subject"
 msgstr "연관된 메세지가 아니더라도 제목에 따라 글타래로 만들기(_A)"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr "서식 플러그인에서 메세지 본문 대신 사용할 키/값 쌍의 목록."
+
+#: ../plugins/templates/templates.c:614
+msgid "No title"
+msgstr "제목 없음"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "서식으로 저장(_T)"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "서식으로 저장"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "메일 초안 기준 서식 플러그인"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "YTNEF를 사용해 TNEF 첨부를 디코딩하는 간단한 플러그인."
@@ -18692,86 +19786,160 @@ msgid "Evolution Test component"
 msgstr "에볼루션 테스트 컴포넌트"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "현재 프린터 설정의 설명 문자열."
+msgid "Authenticate proxy server connections"
+msgstr "프록시 서버 연결 인증하기"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
+msgid "Automatic proxy configuration URL"
+msgstr "자동 프록시 설정 URL"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "설정 버전"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Decides whether the crash detection should be run or not."
 msgstr "이상 종료 검사를 실행할 지 여부를 결정합니다."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "기본 보조 모음 너비"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "기본 창 높이"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "기본 창 상태"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "기본 창 너비"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "인터넷을 통해 HTTP 및 보안 HTTP를 사용할 때 프록시 설정을 사용합니다."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "HTTP proxy host name"
+msgstr "HTTP 프록시 호스트 이름"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy password"
+msgstr "HTTP 프록시 암호"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy port"
+msgstr "HTTP 프록시 포트"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "HTTP proxy username"
+msgstr "HTTP 프록시 사용자 이름"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "맨 처음 시작할 때 기본으로 보여줄 컴포넌트 ID 혹은 별명."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username/password combo is defined by \"/apps/evolution/shell/network_config/"
+"authentication_user\" and locally stored password in .gnome2_private/."
+msgstr ""
+"참이면 프록시 서버에 연결할 때 인증이 필요합니다. 사용자 이름과 암호는 \"/"
+"apps/evolution/shell/network_config/authentication_user\"에 정의하고 로컬 컴"
+"퓨터의 .gnome2_private/ 안에 저장합니다."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
 msgstr "최근 업그레이드한 설정 버전"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "오프라인에서 사용할 때 동기화할 폴더의 경로 목록"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Non-proxy hosts"
+msgstr "프록시 없음 호스트"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr "HTTP 프록시에 인증할 때 넘길 암호."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Proxy configuration mode"
+msgstr "프록시 설정 모드"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy host name"
+msgstr "SOCKS 프록시 호스트 이름"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "SOCKS proxy port"
+msgstr "SOCKS 프록시 포트"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy host name"
+msgstr "보안 HTTP 프록시 호스트 이름"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Secure HTTP proxy port"
+msgstr "보안 HTTP 프록시 포트"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
+msgstr ""
+"프록시 설정 모드를 선택합니다. 지원하는 값은 0, 1, 2, 3이고, 각각의 의미는 "
+"\"시스템 설정 사용\", \"프록시 없음\", \"수동 프록시 설정 사용\", \"자동 설"
+"정 URL에 들어 있는 프록시 설정 사용\"입니다."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "보조 모음을 표시합니다"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "개발 버전 경고 건너 뛰기"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
 msgstr "복구 경고 건너 뛰기"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:571
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
 msgid "Start in offline mode"
 msgstr "오프라인 모드에서 시작"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "상태 표시줄을 표시합니다"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr ""
 "에볼루션의 설정 버전, major/minor/configuration 단계. (예를 들어 \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default height for the main window, in pixels."
 msgstr "메인 창의 기본 높이, 픽셀 단위."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "The default width for the main window, in pixels."
 msgstr "메인 창의 기본 너비, 픽셀 단위."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "보조 모음의 기본 너비, 픽셀 단위."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -18779,7 +19947,43 @@ msgstr ""
 "최근 업그레이드한 에볼루션의 설정 버전, major/minor/configuration 단계. (예"
 "를 들어 \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The machine name to proxy HTTP through."
+msgstr "HTTP 프록시로 사용할 컴퓨터 이름."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The machine name to proxy secure HTTP through."
+msgstr "보안 HTTP 프록시로 사용할 컴퓨터 이름."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+msgid "The machine name to proxy socks through."
+msgstr "SOCKS 프록시로 사용할 컴퓨터 이름."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+"프록시로 이용할 \"/apps/evolution/shell/network_config/http_host\"에서 지정"
+"한 컴퓨터의 포트."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+"프록시로 이용할 \"/apps/evolution/shell/network_config/secure_host\"에서 지정"
+"한 컴퓨터의 포트."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+"프록시로 이용할 \"/apps/evolution/shell/network_config/socks_host\"에서 지정"
+"한 컴퓨터의 포트."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -18788,52 +19992,76 @@ msgstr ""
 "창 단추의 모양새. \"text\", \"icons\", \"both\", \"toolbar\" 사용 가능. "
 "\"toolbar\"일 경우 그놈 도구 모음 설정에 따라서 단추의 모양새가 결정됩니다."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+"이 키에는 프록시를 사용하지 않고 (프록시가 있더라도) 직접 연결할 호스트의 목"
+"록이 들어 있습니다. 이 값에는 호스트 이름, 도메인(*.foo.com과 같이 앞에 와일"
+"드카드 사용), IP 주소(IPv4와 IPv6 모두 가능), 네트마스크를 사용한 네트워크 주"
+"소(192.168.0.0/24와 같이) 모두 사용할 수 있습니다."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "도구 모음을 표시합니다"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "URL that provides proxy configuration values."
+msgstr "프록시 설정 값이 들어 있는 URL."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+msgid "Use HTTP proxy"
+msgstr "HTTP 프록시 사용"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr "HTTP 프록시에 인증할 때 넘길 사용자 이름."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "에볼루션이 처음에 온라인이 아니라 오프라인 모드로 시작하는 지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether crash detection should be done or not"
 msgstr "이상 종료 검사를 해야 할 지 여부"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether or not the window should be maximized."
 msgstr "창을 최대화할 지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "보조 모음을 표시할 지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the status bar should be visible."
 msgstr "상태 표시줄을 표시할 지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
 msgstr "도구 모음을 표시할 지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "에볼루션 개발 버전의 경고 대화 상자를 건너 뛸지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in recovery of Evolution is skipped."
 msgstr "에볼루션 복구 대화 상자를 건너 뛸지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "창 단추를 표시해야 하는 지 여부."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "창 단추 모양새"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "창 단추 표시할 지 여부"
 
@@ -18849,11 +20077,11 @@ msgstr "사용하고 있는 연결"
 msgid "Click OK to close these connections and go offline"
 msgstr "연결을 끊고 오프라인으로 가려면 확인을 누르십시오"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:132
 msgid "Choose the type of importer to run:"
 msgstr "실행할 가져오기 종류를 선택하십시오:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -18867,11 +20095,11 @@ msgstr ""
 "파일 종류를 모르겠으면 \"자동\"을 선택하면, 에볼루션에서 자동으로 파일 종류"
 "를 알아내 처리하려고 합니다."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid "Choose the destination for this import"
 msgstr "어디로 가져올 지를 고르십시오"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:147
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -18882,150 +20110,134 @@ msgstr ""
 "PINE, 넷스케이프, ELM, iCalendar. 가져올 수 있는 설정을 찾을 수\n"
 "없었습니다. 다시 시도하려면 \"뒤로\" 단추를 누르십시오.\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "파일 이름(_I):"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "파일을 고르십시오"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:299
 msgid "File _type:"
 msgstr "파일 종류(_T):"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:335
 msgid "Import data and settings from _older programs"
 msgstr "과거에 쓰던 프로그램에서 데이터 및 설정 사항 가져오기(_O)"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:338
 msgid "Import a _single file"
 msgstr "파일 한 개 가져오기(_S)"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-settings-dialog.c:314
 msgid "Evolution Preferences"
 msgstr "에볼루션 기본 설정"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "폴더 이름을 지정하지 않았습니다."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "폴더 이름에 리턴 문자가 들어갈 수 없습니다."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "폴더 이름에 \"/\" 문자가 들어갈 수 없습니다."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "폴더 이름에 \"#\" 문자가 들어갈 수 없습니다."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' 과 '..'는 쓸 수 없는 폴더 이름입니다."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:342
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - 에볼루션"
 
-#: ../shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "이 시스템에 그놈 파일럿 툴이 설치되지 않았습니다."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "%s 실행 중 오류가 발생했습니다."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy가 설치되지 않았습니다."
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy를 실행할 수 없습니다."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:663
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr "GNOME Korea <gnome-kr-hackers@lists.kldp.net>"
 
-#: ../shell/e-shell-window-commands.c:674
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "에볼루션 웹사이트"
 
-#: ../shell/e-shell-window-commands.c:692
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "FAQ 웹페이지를 여는 중에 오류가 발생했습니다."
 
-#: ../shell/e-shell-window-commands.c:889
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "온라인 작업(_W)"
 
-#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "오프라인 작업(_W)"
 
-#: ../shell/e-shell-window-commands.c:915
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "오프라인에서 작업"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:377
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
-"에볼루션은 현재 온라인 상태입니다. 오프라인 상태로 작업하려면 이 단추를 누르"
-"십시오."
+"에볼루션은 현재 온라인 상태입니다.\n"
+"오프라인 상태로 작업하려면 이 단추를 누르십시오."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "에볼루션은 오프라인 상태로 가는 중입니다."
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:391
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
-"에볼루션은 현재 오프라인 상태입니다. 온라인 상태로 작업하려면 이 단추를 누르"
-"십시오."
+"에볼루션은 현재 오프라인 상태입니다.\n"
+"온라인 상태로 작업하려면 이 단추를 누르십시오."
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:780
 #, c-format
 msgid "Switch to %s"
 msgstr "%s 창으로 바꾸기"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:638
 msgid "Unknown system error."
 msgstr "알 수 없는 시스템 오류."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:315
 msgid "OK"
 msgstr "확인"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1280
 msgid "Invalid arguments"
 msgstr "인자가 잘못되었습니다"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1282
 msgid "Cannot register on OAF"
 msgstr "OAF에 등록할 수 없습니다"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1284
 msgid "Configuration Database not found"
 msgstr "설정 데이터베이스를 찾을 수 없습니다"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "새로 만들기"
 
@@ -19080,7 +20292,7 @@ msgstr ""
 "르십시오."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:228
+#: ../shell/main.c:222
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19114,7 +20326,7 @@ msgstr ""
 "우리가 열심히 일한 결과물을 잘 써 주시길 바랍니다. 그리고 개발에\n"
 "기여해 주시기를 목이 빠지게 기다리겠습니다!\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19122,19 +20334,19 @@ msgstr ""
 "고맙습니다\n"
 "에볼루션 팀\n"
 
-#: ../shell/main.c:259
+#: ../shell/main.c:253
 msgid "Do not tell me again"
 msgstr "다시 알리지 않기"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:303
 msgid "Evolution Crash Detection"
 msgstr "에볼루션 이상 종료 검사"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:305
 msgid "Ig_nore"
 msgstr "무시(_N)"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:320
 #, no-c-format
 msgid ""
 "Evolution appears to have exited unexpectedly the last time it was\n"
@@ -19145,43 +20357,43 @@ msgstr ""
 "문제 예방을 위해 미리 보기 창을 감춥니다. 보기 메뉴에서 미리 보기\n"
 "창을 다시 표시할 수 있습니다.\n"
 
-#: ../shell/main.c:337
+#: ../shell/main.c:331
 msgid "_Do not show this message again"
 msgstr "이 메세지를 다시 보지 않기(_D)"
 
-#: ../shell/main.c:569
+#: ../shell/main.c:563
 msgid "Start Evolution activating the specified component"
 msgstr "에볼루션 시작할 때 특정 컴포넌트를 활성화합니다"
 
-#: ../shell/main.c:573
+#: ../shell/main.c:567
 msgid "Start in online mode"
 msgstr "온라인 모드에서 시작"
 
-#: ../shell/main.c:576
+#: ../shell/main.c:570
 msgid "Forcibly shut down all Evolution components"
 msgstr "강제로 모든 에볼루션 컴포넌트를 끝냅니다"
 
-#: ../shell/main.c:580
+#: ../shell/main.c:574
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "강제로 에볼루션 1.4에서 다시 옮겨 옵니다"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:577
 msgid "Send the debugging output of all components to a file."
 msgstr "모든 컴포넌트의 디버깅 출력을 파일로 보냅니다."
 
-#: ../shell/main.c:585
+#: ../shell/main.c:579
 msgid "Disable loading of any plugins."
 msgstr "플러그인을 아무것도 읽어들이지 않습니다."
 
-#: ../shell/main.c:587
+#: ../shell/main.c:581
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "전자메일, 연락처, 작업의 미리 보기 창을 사용하지 않습니다."
 
-#: ../shell/main.c:617
+#: ../shell/main.c:666
 msgid "- The Evolution PIM and Email Client"
 msgstr "- 에볼루션 개인정보 관리 및 메일 클라이언트"
 
-#: ../shell/main.c:630
+#: ../shell/main.c:694
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19323,7 +20535,7 @@ msgstr ""
 "\n"
 "계속하시면, 과거의 데이터중에 접근할 수 없는 데이터가 있을 수 있습니다.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19334,7 +20546,7 @@ msgstr ""
 "\n"
 "신뢰 수준을 편집하십시오:"
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:151
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -19343,7 +20555,7 @@ msgstr ""
 "이 인증서를 발급한 인증 기관을 신뢰한다고 하셨으므로, 따로 지정하지 않는 한 "
 "이 인증서를 믿을만 하다고 신뢰합니다."
 
-#: ../smime/gui/cert-trust-dialog.c:158
+#: ../smime/gui/cert-trust-dialog.c:155
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -19400,11 +20612,16 @@ msgstr "전자메일 주소"
 msgid "All CA certificate files"
 msgstr "모든 CA 인증서 파일"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:339
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "인증서 보기: %s"
 
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "`%s'의 암호를 입력하십시오"
+
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -19415,7 +20632,7 @@ msgid "Enter new password"
 msgstr "새 암호를 입력하십시오"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:115
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19424,7 +20641,7 @@ msgstr ""
 "발급 대상:\n"
 "  소유자: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19433,7 +20650,7 @@ msgstr ""
 "발급자:\n"
 "  소유자: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:168
 msgid "Select certificate"
 msgstr "인증서 선택"
 
@@ -19620,7 +20837,7 @@ msgid "_Edit CA Trust"
 msgstr "인증 기관 신뢰수준 편집(_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:679
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "인증서가 이미 있습니다"
 
@@ -19828,8 +21045,7 @@ msgstr "모든 연락처 복사(_P)..."
 msgid "Contact _Preview"
 msgstr "연락처 미리 보기(_P)"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "복사"
@@ -19854,8 +21070,7 @@ msgstr "폴더로 복사..."
 msgid "Create a new addressbook folder"
 msgstr "새 주소록 폴더를 만듭니다"
 
-#: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "잘라내기"
@@ -19896,8 +21111,7 @@ msgstr "선택한 폴더의 연락처를 다른 폴더로 옮깁니다"
 msgid "Move to Folder..."
 msgstr "폴더로 이동..."
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "붙여 넣기"
@@ -19934,13 +21148,11 @@ msgstr "선택한 연락처를 VCard로 저장합니다."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "선택한 폴더의 연락처를 VCard로 저장합니다"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "모두 선택"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "전부 선택(_A)"
 
@@ -20070,7 +21282,7 @@ msgid "Month"
 msgstr "한 달"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "다음"
 
@@ -20079,7 +21291,7 @@ msgid "Previews the calendar to be printed"
 msgstr "인쇄할 달력을 미리 봅니다"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "이전"
 
@@ -20147,237 +21359,6 @@ msgstr "근무 주"
 msgid "_Open Appointment"
 msgstr "약속 열기(_O)"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "선택한 메세지를 클립보드로 복사합니다"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "선택한 사항을 클립보드로 복사합니다"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "선택한 텍스트를 클립보드로 잘라냅니다"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "선택한 사항을 클립보드로 잘라냅니다"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "클립보드에서 붙여 넣습니다"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "클립보드에서 텍스트를 붙여 넣습니다"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "모든 텍스트 선택"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "첨부"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "파일을 첨부하려면 여기를 누르십시오"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "현재 창을 닫으려면 여기를 누르십시오"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "현재 창을 저장하려면 여기를 누르십시오"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "해당 도움말을 보려면 여기를 누르십시오"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "닫기"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "넣기(_N)"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "첨부(_A)..."
-
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "닫기(_C)"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:53
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "파일(_F)"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "도움말(_H)"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "옵션(_O)"
-
-# event -> 행사, Microsoft Office XP 참고
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "하루 종일 행사"
-
-# event -> 행사, Microsoft Office XP 참고
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "하루 종일 행사(_D)"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "비밀로 분류"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "개인으로 분류"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "공용으로 분류"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "이 행사에 알림을 설정하거나 해제하려면 여기를 누르십시오"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "고급 보내기 옵션 넣기"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "반복 행사로 만듭니다"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "공개(_B)"
-
-# free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "참석자의 약속 있음/없음 정보를 알아봅니다"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "역할 항목(_O)"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "보내기 옵션(_O)"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "시간을 약속 있음으로 표시(_B)"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "시간대(_Z)"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "참석자 종류 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "응답요청 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "역할 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "상태 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "시간대 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "분류를 보여줄 지 토글합니다"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "하루 종일 행사가 있는 지 토글합니다"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "시간을 약속 있음으로 보여줄 지 토글합니다"
-
-# Alarm -> 알림, Microsoft Office XP 참고
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "알림(_A)"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "분류(_C)"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "분류(_C)"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "비밀(_C)"
-
-# free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "약속 있음/없음(_F):"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "개인(_P)"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "응답바람(_R)"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "반복(_R)"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "상태 항목(_S)"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "종류 항목(_T)"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "현재 메일 동작을 취소합니다"
@@ -20407,7 +21388,6 @@ msgid "Empty _Trash"
 msgstr "휴지통 비우기(_T)"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "폴더(_O)"
 
@@ -21089,9 +22069,9 @@ msgstr "확대/축소(_Z)"
 msgid "_Zoom In"
 msgstr "확대(_Z)"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "이 창을 닫습니다"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "닫기"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -21129,291 +22109,6 @@ msgstr "선택한 메모를 봅니다"
 msgid "_Open Memo"
 msgstr "메모 열기(_O)"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "파일을 첨부합니다"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "현재 파일을 닫습니다"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "서명만 남기고 모두 지웁니다"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "이 메세지를 PGP로 암호화합니다"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "이 메세지를 S/MIME 암호화 인증서로 암호화합니다"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "형식(_M)"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "메세지를 읽으면 배달 확인 받기"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HTML(_M)"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "보내기 옵션 넣기"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "파일을 엽니다"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "PGP 암호화"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "PGP 서명"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "PGP 암호화(_E)"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "PGP 서명(_S)"
-
-# read receipt -> 내용 읽음 확인, Microsoft Office XP 참고
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "내용 읽음 확인 요청(_E)"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "S/MIME 암호화(_C)"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "S/MIME 암호화"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "S/MIME 서명(_N)"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "S/MIME 서명"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "보내기(_E)"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "다른 이름으로 저장"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "임시 보관함에 저장"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "다른 이름으로 저장(_A)..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "임시 보관함에 저장(_D)"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "임시 보관함에 저장"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "폴더로 저장..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "현재 파일을 저장합니다"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "현재 파일을 다른 이름으로 저장합니다"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "메세지를 지정한 폴더로 저장합니다"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "보내기"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "메일을 HTML형식으로 보냄"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "이 메세지를 지금 보냅니다"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "메세지 우선순위를 높입니다"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "이 메세지를 PGP키로 서명합니다"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "이 메세지를 S/MIME 서명 증명으로 서명합니다"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "숨은 참조 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "참조 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "발신 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "올리는 곳 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "회신 주소 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "받는 사람 항목을 보여줄 지 토글합니다"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "숨은 참조 항목(_B)"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "참조 항목(_C)"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "모두 지우기(_D)"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "발신 항목(_F)"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "열기(_O)..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "올리는 곳 항목(_P)"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "메세지 우선순위 높이기(_P)"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "회신 주소 항목(_R)"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "보안(_S)"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "보내기 옵션(_S)"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "받는 사람 항목(_T)"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "닫기(_L)"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "HTML(_T)"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "저장 후 닫기"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "저장 후 닫기(_C)"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "이 파일을 저장하고 창을 닫습니다"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "구독 폴더의 목록에 폴더를 더합니다"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "목록 다시읽음"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "폴더 목록을 다시 읽습니다"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "구독 폴더의 목록에서 폴더를 지웁니다"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "구독"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "구독 중지"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "선택 반전(_I)"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "누르면 작업의 자세한 정보를 바꾸거나 봅니다"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "상태 자세히"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "시간대"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "상태 자세히(_S)"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "선택한 작업을 복사합니다"
@@ -21727,11 +22422,11 @@ msgid "With _Status"
 msgstr "상태 포함(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
 msgid "UTC"
 msgstr "UTC"
 
@@ -21748,8 +22443,8 @@ msgid "Select a Time Zone"
 msgstr "시간대를 선택하십시오"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "시간대 콤보 상자"
+msgid "Timezone drop-down combination box"
+msgstr "시간대 드롭다운 콤보 상자"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -21760,19 +22455,19 @@ msgstr ""
 "왼쪽 마우스 단추로 지도에서 특정 지역을 확대한 다음 시간대를 선택하십시오.\n"
 "오른쪽 마우스 단추로 축소합니다."
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr "모음"
 
-#: ../widgets/menus/gal-define-views-dialog.c:360
+#: ../widgets/menus/gal-define-views-dialog.c:358
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "%s에 대한 뷰 정의"
 
+#: ../widgets/menus/gal-define-views-dialog.c:366
 #: ../widgets/menus/gal-define-views-dialog.c:368
-#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "뷰 정의"
 
@@ -21782,18 +22477,18 @@ msgid "Define Views for \"%s\""
 msgstr "\"%s\"에 대한 뷰 정의"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../widgets/table/e-table-scrolled.c:216
 #: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "도표"
 
 # NOTE: 겉으로 나오는 번역이 아니므로 번역이 별로 의미없음.  view의 instance.
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "인스턴스"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "현재 뷰 저장"
 
@@ -21845,11 +22540,11 @@ msgstr "현재 사용자 보기 저장"
 msgid "Create or edit views"
 msgstr "보기 만들기 또는 편집"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "팩토리"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "새 뷰 정의"
 
@@ -21865,17 +22560,17 @@ msgstr "뷰 종류"
 msgid "Type of view:"
 msgstr "뷰 종류:"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "첨부 모음"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "%s 파일을 첨부할 수 없습니다: %s"
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "%s 파일을 첨부할 수 없습니다: 일반 파일이 아닙니다"
@@ -21897,33 +22592,32 @@ msgid "Suggest automatic display of attachment"
 msgstr "첨부 파일의 자동 표시 권하기"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1726
+#: ../widgets/misc/e-calendar-item.c:1273
 msgid "%B %Y"
 msgstr "%Y년 %B"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "달별 달력"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "채우기 색"
 
 #: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
+#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
+#: ../widgets/text/e-text.c:3659
 msgid "GDK fill color"
 msgstr "GDK 채우기 색"
 
 #: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "스티플 채우기"
 
@@ -21948,29 +22642,29 @@ msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "최소 너비"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "최소 너비"
 
 #: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "공백"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:291
 msgid "Now"
 msgstr "현재"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:848
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "시간은 다음과 같은 형식이어야 합니다: %s"
@@ -21979,189 +22673,187 @@ msgstr "시간은 다음과 같은 형식이어야 합니다: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "퍼센트 값은 0과 100을 포함하여 그 사이어야 합니다."
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Arabic"
 msgstr "아랍어"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Baltic"
 msgstr "발트어"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Central European"
 msgstr "중앙 유럽어"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Chinese"
 msgstr "중국어"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Cyrillic"
 msgstr "키릴어"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Greek"
 msgstr "그리스어"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Hebrew"
 msgstr "히브리어"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "일본어"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "한국어"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Thai"
 msgstr "타이어"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
 msgstr "터키어"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
 msgstr "유니코드"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Western European"
 msgstr "서부 유럽어"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European, New"
 msgstr "서부 유럽어, 새로운 인코딩"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
 msgid "Traditional"
 msgstr "번체"
 
-#: ../widgets/misc/e-charset-picker.c:100
-#: ../widgets/misc/e-charset-picker.c:101
-#: ../widgets/misc/e-charset-picker.c:102
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
 msgstr "간체"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:97
 msgid "Ukrainian"
 msgstr "우크라이나어"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Visual"
 msgstr "비주얼"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:169
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "알 수 없는 문자셋: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:214
 msgid "Character Encoding"
 msgstr "문자 인코딩"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:229
 msgid "Enter the character set to use"
 msgstr "사용할 문자셋 입력하십시오"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:336
 msgid "Other..."
 msgstr "그 외..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:598
 msgid "Ch_aracter Encoding"
 msgstr "문자 인코딩(_A)"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "날짜 및 시간"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "날짜 입력하는 텍스트 엔트리"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "달력을 보려면 단추를 누르십시오"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
-msgstr "시간을 선택하는 콤보 상자"
+#: ../widgets/misc/e-dateedit.c:394
+msgid "Drop-down combination box to select time"
+msgstr "시간을 선택하는 드롭다운 콤보 상자"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "현재(_W)"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "오늘(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "날짜 값이 잘못되었습니다"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "시간 값이 잘못되었습니다"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "확장됨"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "확장 단추가 확장되었는 지 여부"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "확장 단추의 레이블 텍스트"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "밑줄 사용"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr ""
 "참일 경우, 텍스트에서 밑줄을 쓰면 그 다음 문자가 빨리 가기 키로 쓰입니다"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "레이블과 하위 위젯 사이에 넣을 공백"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "레이블 위젯"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "일반적인 확장 단추 레이블 대신에 표시할 위젯"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
 msgid "Expander Size"
 msgstr "확장 단추 크기"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
 msgid "Size of the expander arrow"
 msgstr "확장 화살표의 크기"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "표시 여백"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "확장 화살표 주위의 여백"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
-#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:748
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
 msgid "Advanced Search"
 msgstr "고급 찾기"
 
@@ -22206,21 +22898,29 @@ msgstr "현재 폴더"
 msgid "Current Message"
 msgstr "현재 메세지"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:167
 msgid "Choose Image"
 msgstr "그림을 고르십시오"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:625
 msgid "World Map"
 msgstr "세계 지도"
 
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:627
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
+"should instead select the timezone from the drop-down combination box below."
 msgstr ""
-"마우스를 이용해 시간대를 선택하는 지도 위젯. 키보드 사용자는 아래의 콤보 상자"
-"를 이용해 시간대를 선택해야 합니다."
+"마우스를 이용해 시간대를 선택하는 지도 위젯. 키보드 사용자는 아래의 드롭다운 "
+"콤보 상자를 이용해 시간대를 선택해야 합니다."
+
+#: ../widgets/misc/e-online-button.c:112
+msgid "Online"
+msgstr "인라인"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr "단추 상태가 온라인입니다."
 
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
@@ -22246,62 +22946,62 @@ msgstr "리플로우 모델"
 msgid "Column width"
 msgstr "열 너비"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "찾기"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "찾기 종류를 바꾸려면 여기를 누르십시오"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "찾기(_S)"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "지금 찾기(_F)"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "비우기(_C)"
 
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "항목 ID"
 
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "텍스트"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1013
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "보기(_W): "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1030
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "찾기(_C): "
 
 # FIXME - hard to translate UI + string based on English grammar
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1042
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " 위치(_N) : "
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "커서 행"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "커서 열"
@@ -22318,7 +23018,7 @@ msgstr "선택 모드"
 msgid "Cursor Mode"
 msgstr "커서 모드"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:518
 msgid "When de_leted:"
 msgstr "지울 때(_L):"
 
@@ -22342,10 +23042,6 @@ msgstr "<b>상태 추적</b>"
 msgid "A_uto-delete sent item"
 msgstr "보낸 항목 자동으로 지우기(_U)"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "분류"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "정보 추적을 위한 보낸 항목 만들기(_E)"
@@ -22428,39 +23124,40 @@ msgstr "다음 뒤에(_A):"
 msgid "_All information"
 msgstr "모든 정보(_A)"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#. To translators: This means Delay the message delivery for some time
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
 msgstr "메세지 배달 지연(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "배달됨(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "만료 날짜 설정(_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "기한(_U):"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "편리한 때에(_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "열면(_W):"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:303
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 완료)"
@@ -22505,23 +23202,23 @@ msgstr "포커스한 열"
 msgid "Unselected Column"
 msgstr "선택 해제한 열"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "취소선 열"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "밑줄 열"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "굵은 글자 열"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "색깔 있는 열"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "배경색 열"
 
@@ -22559,7 +23256,7 @@ msgid "A_vailable Fields:"
 msgstr "사용 가능한 필드(_V):"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "증가"
 
@@ -22572,7 +23269,7 @@ msgid "Clear _All"
 msgstr "모두 지우기(_A)"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "감소"
 
@@ -22635,14 +23332,14 @@ msgstr "정렬(_S)..."
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
 #: ../widgets/table/e-table-field-chooser-item.c:634
 #: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1886
+#: ../widgets/table/e-table-header-item.c:1887
 msgid "DnD code"
 msgstr "끌어놓기 코드"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
 #: ../widgets/table/e-table-field-chooser-item.c:641
 #: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "완전한 제목"
 
@@ -22659,7 +23356,7 @@ msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
 msgstr ""
-"표에 열을 더하려면, 열을 표시할\n"
+"표에 열을 추가하려면, 열을 표시할\n"
 "위치에 열을 끌어 놓으십시오."
 
 #: ../widgets/table/e-table-group-container.c:345
@@ -22674,293 +23371,491 @@ msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d개 항목)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "행에 색 교차"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "가로 격자 그리기"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "세로 격자 그리기"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "포커스 그리기"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "커서 모드"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "선택 모델"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "길이 한계치"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "행 높이 통일"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "고정"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "현재 뷰 사용자 설정하기"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "오름차순 정렬 (_A)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "내림차순 정렬(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "정렬 안함(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "이 범위로 묶음(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "상자로 묶음(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "열 지우기(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "열 추가(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "정렬(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "자동 맞춤(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "열 형식(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "현재 보기 사용자 설정(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "정렬 기준(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "사용자 설정(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "글꼴 설명"
 
-#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-header-item.c:1915
 #: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "정렬 정보"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "트리"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "테이블 헤더"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "테이블 모델"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "커서 행"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-tree.c:3356
 msgid "Always search"
 msgstr "언제나 찾기"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "추가하려면 누르기 사용"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
 msgid "ETree table adapter"
 msgstr "ETree 테이블 어댑터"
 
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3362
 msgid "Retro Look"
 msgstr "리트로 모양"
 
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3363
 msgid "Draw lines and +/- expanders."
 msgstr "선과 +/- 확장 버튼을 그립니다."
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "입력기"
 
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "이벤트 처리기"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "굵은 글씨"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "취소선"
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "연결"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "맞춤"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "자르기 너비"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "자르기 높이"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "자르기"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "자르기 사각형"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "가로 오프셋"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "세로 오프셋"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "텍스트 너비"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "텍스트 높이"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
-msgstr "타원 사용"
+msgstr "말줄임표 사용"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
-msgstr "타원"
+msgstr "말줄임표"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "줄 바꿈"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "끊김 문자"
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "최대 줄 수"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "테두리 그리기"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "줄바꿈 허용"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "배경 그리기"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "단추 그리기"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "커서 위치"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "입력기 컨텍스트"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "팝업 처리"
 
+#~ msgid "Permission Denied."
+#~ msgstr "권한이 거부되었습니다."
+
+#~ msgid "<b>Display</b>"
+#~ msgstr "<b>표시</b>"
+
+#~ msgid "<b>Server Information</b>"
+#~ msgstr "<b>서버 정보</b>"
+
+#~ msgid "Unknown reason"
+#~ msgstr "알 수 없는 이유"
+
+#~ msgid "Open File"
+#~ msgstr "파일 열기"
+
+#~ msgid "Cannot open file &quot;{0}&quot;."
+#~ msgstr "&quot;{0}&quot; 파일을 열 수 없습니다."
+
+#~ msgid "Attach original message"
+#~ msgstr "원문 첨부"
+
+#~ msgid "Do not quote original message"
+#~ msgstr "원문 인용하지 않음"
+
+#~ msgid "Quote original message"
+#~ msgstr "원문 인용"
+
+#~ msgid "Enter a name for this signature."
+#~ msgstr "이 서명의 이름을 입력하십시오."
+
+#~ msgid "Name:"
+#~ msgstr "이름:"
+
+#~ msgid ""
+#~ "Are you sure you want to permanently remove all the deleted messages in "
+#~ "folder &quot;{0}&quot;?"
+#~ msgstr "정말로 &quot;{0}&quot; 폴더의 지운 메세지를 완전히 비우시겠습니까?"
+
+#~ msgid "Delete &quot;{0}&quot;?"
+#~ msgstr "&quot;{0}&quot;을(를) 지우시겠습니까?"
+
+#~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+#~ msgstr "&quot;{0}&quot; 찾기 폴더 안의 메세지를 지우시겠습니까?"
+
+#~ msgid "Only on _Current Folder"
+#~ msgstr "현재 폴더에만(_C)"
+
+#~ msgid "Enable attachment reminder plugin"
+#~ msgstr "첨부 알림 플러그인 사용"
+
+#~ msgid "Enable attachment reminder plugin."
+#~ msgstr "첨부 알림 플러그인 사용."
+
+#~ msgid "Remind _missing attachments"
+#~ msgstr "첨부 없음 알리기(_M)"
+
+#~ msgid "_Continue Editing"
+#~ msgstr "편집 계속(_C)"
+
+#~ msgid "_Refresh:"
+#~ msgstr "새로 고침(_R):"
+
+#~ msgid "There is no configuration option for this plugin."
+#~ msgstr "이 플러그인은 설정 옵션이 없습니다."
+
+#~ msgid "Gives an option to print from the composer."
+#~ msgstr "편지 작성에서 인쇄할 수 있는 옵션 사용."
+
+#~ msgid "Print Message"
+#~ msgstr "메세지 인쇄"
+
+#~ msgid "Prints the message"
+#~ msgstr "메세지를 인쇄합니다"
+
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "현재 프린터 설정의 설명 문자열."
+
+#~ msgid "No folder name specified."
+#~ msgstr "폴더 이름을 지정하지 않았습니다."
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "폴더 이름에 리턴 문자가 들어갈 수 없습니다."
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "폴더 이름에 \"/\" 문자가 들어갈 수 없습니다."
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "폴더 이름에 \"#\" 문자가 들어갈 수 없습니다."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "'.' 과 '..'는 쓸 수 없는 폴더 이름입니다."
+
+#~ msgid "Copy selection to clipboard"
+#~ msgstr "선택한 사항을 클립보드로 복사합니다"
+
+#~ msgid "Cut selection to clipboard"
+#~ msgstr "선택한 사항을 클립보드로 잘라냅니다"
+
+#~ msgid "Paste from clipboard"
+#~ msgstr "클립보드에서 붙여 넣습니다"
+
+# event -> 행사, Microsoft Office XP 참고
+#~ msgid "All Day Event"
+#~ msgstr "하루 종일 행사"
+
+#~ msgid "Send _Options"
+#~ msgstr "보내기 옵션(_O)"
+
+#~ msgid "Delete all but signature"
+#~ msgstr "서명만 남기고 모두 지웁니다"
+
+#~ msgid "For_mat"
+#~ msgstr "형식(_M)"
+
+#~ msgid "HT_ML"
+#~ msgstr "HTML(_M)"
+
+#~ msgid "Open a file"
+#~ msgstr "파일을 엽니다"
+
+#~ msgid "PGP Encrypt"
+#~ msgstr "PGP 암호화"
+
+#~ msgid "PGP Sign"
+#~ msgstr "PGP 서명"
+
+#~ msgid "S/MIME Encrypt"
+#~ msgstr "S/MIME 암호화"
+
+#~ msgid "S/MIME Sign"
+#~ msgstr "S/MIME 서명"
+
+#~ msgid "Save As"
+#~ msgstr "다른 이름으로 저장"
+
+#~ msgid "Save Draft"
+#~ msgstr "임시 보관함에 저장"
+
+#~ msgid "Save in folder..."
+#~ msgstr "폴더로 저장..."
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "메세지를 지정한 폴더로 저장합니다"
+
+#~ msgid "Send"
+#~ msgstr "보내기"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "메일을 HTML형식으로 보냄"
+
+#~ msgid "_Delete all"
+#~ msgstr "모두 지우기(_D)"
+
+#~ msgid "_Open..."
+#~ msgstr "열기(_O)..."
+
+#~ msgid "C_lose"
+#~ msgstr "닫기(_L)"
+
+#~ msgid "H_TML"
+#~ msgstr "HTML(_T)"
+
+#~ msgid "Save and _Close"
+#~ msgstr "저장 후 닫기(_C)"
+
+#~ msgid "Save the current file and close the window"
+#~ msgstr "이 파일을 저장하고 창을 닫습니다"
+
+#~ msgid "Add folder to your list of subscribed folders"
+#~ msgstr "구독 폴더의 목록에 폴더를 더합니다"
+
+#~ msgid "Refresh List"
+#~ msgstr "목록 다시읽음"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "폴더 목록을 다시 읽습니다"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "구독 폴더의 목록에서 폴더를 지웁니다"
+
+#~ msgid "Subscribe"
+#~ msgstr "구독"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "구독 중지"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "선택 반전(_I)"
+
+#~ msgid "Status Details"
+#~ msgstr "상태 자세히"
+
+#~ msgid "Time Zone"
+#~ msgstr "시간대"
+
+#~ msgid "TimeZone Combobox"
+#~ msgstr "시간대 콤보 상자"
+
 #~ msgid ""
 #~ "The address book {0} is read only, thus you cannot add contacts there. "
 #~ "Select other address book, please."
@@ -23031,9 +23926,6 @@ msgstr "팝업 처리"
 #~ msgid "System error: %s"
 #~ msgstr "시스템 오류: %s"
 
-#~ msgid "Camel error: %s"
-#~ msgstr "Camel 오류: %s"
-
 #~ msgid "Account cannot send e-mail"
 #~ msgstr "전자메일을 보낼 수 없는 계정입니다"
 
@@ -23107,18 +23999,12 @@ msgstr "팝업 처리"
 #~ msgid "Di_sable"
 #~ msgstr "사용하지 않음(_S)"
 
-#~ msgid "Automatic smiley recognition"
-#~ msgstr "스마일리 자동 인식"
-
 #~ msgid "HTML Mail"
 #~ msgstr "HTML 메일"
 
 #~ msgid "Select a (48*48) png of size < 720bytes"
 #~ msgstr "크기가 720바이트보다 작은 (48*48) PNG를 고르십시오"
 
-#~ msgid "_Phone List"
-#~ msgstr "전화 목록(_P)"
-
 #~ msgid "<- _Remove"
 #~ msgstr "<- 지우기(_R)"
 
diff --git a/po/nb.po b/po/nb.po
index 7b930504bc..85994d9dcc 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.23.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-09 13:59+0200\n"
-"PO-Revision-Date: 2008-07-09 14:08+0200\n"
+"POT-Creation-Date: 2008-07-29 12:10+0200\n"
+"PO-Revision-Date: 2008-07-29 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmal <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -337,11 +337,9 @@ msgstr "aktiver"
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
-msgstr ""
-"«{0}» er en skrivebeskyttet adressebokkilde. Bytt til kontaktvisning og merk "
-"en adressebok som kan motta kontakter."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr "«{0}» er en skrivebeskyttet adressebok og kan ikke endres. Velg en annen adressebok fra sidelinjen i kontaktvisning."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -389,7 +387,7 @@ msgstr "Kunne ikke fjerne adressebok."
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
 "Foreløpig kan du kun aksessere systemadresseboken for GroupWise fra "
 "Evolution. Vennligst bruk en annen GroupWise-klient en gang for å få tak i "
@@ -511,11 +509,8 @@ msgstr ""
 "for best ytelse."
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid ""
-"You do not have enough permissions to delete contact in this Address Book."
-msgstr ""
-"Du har ikke tilstrekkelige rettigheter til å slette kontakter i denne "
-"adresseboken."
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "Du har ikke rettigheter til å slette kontakter i denne adresseboken."
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
@@ -556,7 +551,7 @@ msgstr "Br_uk som den er"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -644,8 +639,9 @@ msgstr "Håndter dine S/MIME-sertifikater her"
 #: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:311
-#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1455
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "På denne datamaskinen"
 
@@ -662,7 +658,7 @@ msgstr "På denne datamaskinen"
 #: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
 #: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
 #: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
-#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1055
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Personlig"
 
@@ -725,7 +721,7 @@ msgstr "Kopier innholdet i adresse_boken lokalt for frakoblet operasjon"
 #: ../calendar/gui/dialogs/calendar-setup.c:377
 #: ../calendar/gui/dialogs/calendar-setup.c:388
 #: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2366
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Generelt"
@@ -746,12 +742,12 @@ msgstr "Autentisering"
 
 #: ../addressbook/gui/component/addressbook-config.c:977
 #: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detaljer"
 
 #: ../addressbook/gui/component/addressbook-config.c:978
-#: ../mail/em-folder-browser.c:959
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "Søker"
 
@@ -765,12 +761,12 @@ msgid "Address Book Properties"
 msgstr "Egenskaper for adressebok"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migrerer..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrerer «%s»:"
@@ -852,10 +848,10 @@ msgstr "Lagre som vCard..."
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:956
 #: ../calendar/gui/calendar-component.c:620
-#: ../calendar/gui/e-calendar-table.c:1387
+#: ../calendar/gui/e-calendar-table.c:1588
 #: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
 #: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
-#: ../mail/em-folder-tree.c:2095 ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -1237,7 +1233,7 @@ msgstr "kort"
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
 #: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:401
 msgid "minutes"
 msgstr "minutter"
 
@@ -1343,7 +1339,7 @@ msgstr "Telefon"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Arbeid"
 
@@ -1365,9 +1361,9 @@ msgid "_Birthday:"
 msgstr "_Fødselsdag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1848
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
@@ -1470,7 +1466,7 @@ msgstr "Adresse"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:521
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
 #: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
@@ -2795,7 +2791,7 @@ msgstr "_Medlemmer"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
 #: ../addressbook/gui/widgets/e-addressbook-view.c:213
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:507
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Bok"
 
@@ -2889,7 +2885,7 @@ msgstr[1] "%d kontakter"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-addressbook-view.c:227
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:514
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Spør"
 
@@ -2900,7 +2896,7 @@ msgstr "Feil under henting av bokvisning"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-table.c:3353
 #: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
@@ -2932,8 +2928,8 @@ msgid "Save as vCard..."
 msgstr "Lagre som vCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:1124
-#: ../calendar/gui/e-calendar-table.c:1365
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1566
 #: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
@@ -2984,19 +2980,18 @@ msgid "Mo_ve to Address Book..."
 msgstr "_Flytt til adressebok..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:453
-#: ../calendar/gui/e-calendar-table.c:1373
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1574
 #: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:996
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2045
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopier"
 
@@ -3193,11 +3188,11 @@ msgstr "Nettside"
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
 #: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Bredde"
@@ -3208,11 +3203,11 @@ msgstr "Bredde"
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
 #: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Høyde"
@@ -3242,7 +3237,14 @@ msgstr "Maksimal lengde på feltnavn"
 msgid "Column Width"
 msgstr "Kolonnebredde"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:173
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr "\n\nSøker etter kontakter..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3256,7 +3258,7 @@ msgstr ""
 "\n"
 "eller dobbelklikk her for å opprette en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:176
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3270,7 +3272,7 @@ msgstr ""
 "\n"
 "Dobbelklikk her for å opprette en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3280,7 +3282,7 @@ msgstr ""
 "\n"
 "Søk etter kontakten."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3290,7 +3292,7 @@ msgstr ""
 "\n"
 "Ingen oppføringer i denne visningen."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:500
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Adapter"
 
@@ -3320,7 +3322,7 @@ msgid "_Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "_Kopier lokasjon for lenke"
 
@@ -3384,8 +3386,7 @@ msgstr "Kalender"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "Ledig/opptatt"
 
@@ -3407,13 +3408,13 @@ msgid "Web Log"
 msgstr "Nettdagbok"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2355
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
 #: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Fødselsdag"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2356
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
 #: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Bryllupsdag"
@@ -3460,7 +3461,7 @@ msgstr "Egen kontaktinformasjon er ikke definert"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
@@ -3485,8 +3486,8 @@ msgstr "Protokollen er ikke støttet"
 #: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:635 ../calendar/gui/print.c:2523
 msgid "Canceled"
 msgstr "Avbrutt"
 
@@ -4081,20 +4082,16 @@ msgstr "Uhåndtert feil"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
-msgstr ""
-"«{0}» er en skrivebeskyttet kalenderkilde. Bytt til en kalender som kan motta "
-"avtaler."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr "«{0}» er en skrivebeskyttet kalender og kan ikke endres. Velg en annen kalender fra sidelinjen i kalendervisning."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
-msgstr ""
-"«{0}» er en skrivebeskyttet kalenderkilde. Bytt til kalendervisning og merk "
-"en kalender som kan motta avtaler."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr "«{0}» er en skrivebeskyttet kalender og kan ikke endres. Velg en annen kalender som kan motta avtaler."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
@@ -4353,8 +4350,8 @@ msgid "The calendar is not marked for offline usage."
 msgstr "Kalenderen er ikke merket for frakoblet bruk."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
-msgstr "Notatlisten er ikke merket for frakoblet bruk"
+msgid "The memo list is not marked for offline usage."
+msgstr "Notatlisten er ikke merket for frakoblet bruk."
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
@@ -4451,7 +4448,6 @@ msgid "_Discard Changes"
 msgstr "_Forkast endringer"
 
 #: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
-#: ../ui/evolution-editor.xml.h:23
 msgid "_Save"
 msgstr "_Lagre"
 
@@ -4516,7 +4512,7 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Kunne ikke skrive til pilotens applikasjonsblokk for oppgaveliste"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2357
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
@@ -4570,7 +4566,7 @@ msgid "Memos"
 msgstr "Notater"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/e-calendar-table.c:696 ../calendar/gui/e-tasks.c:1429
 #: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
 #: ../calendar/gui/tasks-component.c:540
 #: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
@@ -4610,7 +4606,7 @@ msgstr[1] "minutter"
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:397
+#: ../plugins/google-account-setup/google-source.c:402
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "timer"
@@ -4627,10 +4623,10 @@ msgstr "Avtaler"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1595
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
 #: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1002
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Plassering:"
 
@@ -4639,14 +4635,15 @@ msgid "Snooze _time:"
 msgstr "Utsett-_tid:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:41
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "R_ediger"
 
@@ -4659,7 +4656,7 @@ msgid "location of appointment"
 msgstr "lokasjon for avtalen"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1577
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
@@ -4677,13 +4674,13 @@ msgstr "Beskrivelse av lokasjon er ikke tilgjengelig."
 msgid "You have %d alarms"
 msgstr "Du har %d alarmer"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1707
-#: ../mail/mail-component.c:1584
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1677
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1705
+#: ../mail/mail-component.c:1585
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1681
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4695,7 +4692,7 @@ msgstr ""
 "å sende e-post. Evolution vil vise en vanlig dialog\n"
 "for påminnelse i stedet."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1713
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4712,7 +4709,7 @@ msgstr ""
 "\n"
 "Er du sikker på at du ønsker å kjøre dette programmet?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
@@ -5262,7 +5259,7 @@ msgstr "Slett hendelser eldre enn"
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
 #: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:403
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "dager"
@@ -5294,14 +5291,14 @@ msgstr "_Ny kalender"
 
 #: ../calendar/gui/calendar-component.c:617
 #: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
-#: ../mail/em-folder-tree.c:2090
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Kopier..."
 
 #: ../calendar/gui/calendar-component.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:1126
+#: ../calendar/gui/dialogs/comp-editor.c:2034
 #: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2104
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "Egenska_per..."
@@ -5424,7 +5421,7 @@ msgid "Competition"
 msgstr "Konkurranse"
 
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:340
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:539
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Confidential"
 msgstr "Konfidensiell"
@@ -5517,20 +5514,19 @@ msgid "Phone Calls"
 msgstr "Telefonsamtaler"
 
 #: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:339
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:538
 #: ../calendar/gui/memotypes.xml.h:29
 msgid "Private"
 msgstr "Privat"
 
 #: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
 #: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:338 ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/e-calendar-table.c:537 ../calendar/gui/memotypes.xml.h:30
 msgid "Public"
 msgstr "Offentlig"
 
 #: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
+#: ../calendar/gui/dialogs/event-editor.c:298
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
@@ -5552,7 +5548,7 @@ msgstr "Strategier"
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
-#: ../calendar/gui/tasktypes.xml.h:40 ../mail/mail-dialogs.glade.h:20
+#: ../calendar/gui/tasktypes.xml.h:40
 #: ../plugins/save-calendar/csv-format.c:361
 msgid "Summary"
 msgstr "Sammendrag"
@@ -5618,7 +5614,7 @@ msgstr "Tilgang nektet ved åpning av kalender"
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:605
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "Rediger varsel"
 
@@ -5722,6 +5718,7 @@ msgid "hour(s)"
 msgstr "time(r)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:242
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -5740,7 +5737,6 @@ msgstr "Le_gg til"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Varsel"
 
@@ -5818,7 +5814,7 @@ msgid "Display"
 msgstr "Vis"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Fredag"
@@ -5834,7 +5830,7 @@ msgstr ""
 "Dager"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Mandag"
@@ -5858,7 +5854,7 @@ msgstr ""
 "Søndag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Velg en farge"
 
@@ -5868,7 +5864,7 @@ msgid "S_un"
 msgstr "S_ø."
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Lørdag"
@@ -5886,7 +5882,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Vis uke_nummer i datonavigasjon"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Søndag"
@@ -5905,7 +5901,7 @@ msgid "Template:"
 msgstr "Mal:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Torsdag"
@@ -5920,13 +5916,13 @@ msgid "Time format:"
 msgstr "Tidformat:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Tirsdag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Onsdag"
@@ -6099,39 +6095,39 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:516
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:185 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2340
 msgid " to "
 msgstr " til "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2344
 msgid " (Completed "
 msgstr " (Fullført "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2346
 msgid "Completed "
 msgstr "Fullført "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2351
 msgid " (Due "
 msgstr " (Ferdig "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2353
 msgid "Due "
 msgstr "Ferdig "
 
-#: ../calendar/gui/dialogs/comp-editor.c:205
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "Vedlagt melding - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:210
-#: ../calendar/gui/dialogs/comp-editor.c:383 ../composer/e-msg-composer.c:1772
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
 #: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
@@ -6139,117 +6135,259 @@ msgid_plural "%d attached messages"
 msgstr[0] "Vedlagt melding"
 msgstr[1] "%d vedlagte meldinger"
 
-#: ../calendar/gui/dialogs/comp-editor.c:454 ../composer/e-msg-composer.c:2059
-#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2046
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:456 ../composer/e-msg-composer.c:2061
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2048
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "Avbryt _draoperasjon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
-#: ../calendar/gui/dialogs/comp-editor.c:2854 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
 #: ../plugins/prefer-plain/prefer-plain.c:74
-#: ../widgets/misc/e-attachment-bar.c:484
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:821
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:971
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "Rediger avtale"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "Møte- %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "Avtale - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tildelt oppgave - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "Oppgave - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "Notat - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "Ingen sammendrag"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "Klikk her for å lukke dette vinduet"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "Kopier valgt tekst til utklippstavlen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "Klipp ut valgt tekst til utklippstavlen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "klikk her for å vise tilgjengelig hjelp"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "Lim inn tekst fra utklippstavlen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "Klikk her for å lagre dette vinduet"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "Velg all tekst"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "K_lassifisering"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
+msgid "_File"
+msgstr "_Fil"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:45
+msgid "_Help"
+msgstr "_Hjelp"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "Sett _inn"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "_Alternativer"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:54
+msgid "_View"
+msgstr "_Vis"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_Vedlegg..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "klikk her for å legge ved en fil"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "_Kategorier"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "Slår av/på visning av kategorier"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "Tids_sone"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "Slår av/på visning av tidssone"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "O_ffentlig"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "Klassifiser som offentlig"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "_Privat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "Klassifiser som privat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "_Konfidensiell"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "Klassifiser som konfidensiell"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "R_olle-felt"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "Slår av/på visning av rolle-feltet"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Slår av/på visning av RSVP-feltet"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "_Status-felt"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "Slår av/på visning av status-feltet"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "_Type felt"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Slår av/på visning av deltakertype-feltet"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "Siste doku_menter"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "Legg ved"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> vedlegg"
 msgstr[1] "<b>%d</b> vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1003
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "Skjul ve_dleggsfelt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1006
-#: ../calendar/gui/dialogs/comp-editor.c:1589
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "Vis ve_dleggsfelt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
-#: ../calendar/gui/dialogs/event-page.c:1964
-#: ../calendar/gui/dialogs/task-page.c:1261 ../composer/e-msg-composer.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:2036
 #: ../composer/e-msg-composer.c:1049
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Legg til vedlegg..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1613
+#: ../calendar/gui/dialogs/comp-editor.c:2244
 #: ../mail/em-format-html-display.c:2196
 msgid "Show Attachments"
 msgstr "Vis vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1614
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "Trykk mellomrom for å slå av/på vedleggsfeltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2225
-#: ../calendar/gui/dialogs/comp-editor.c:2268
-msgid "Edit Appointment"
-msgstr "Rediger avtale"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2231
-#: ../calendar/gui/dialogs/comp-editor.c:2274
-#, c-format
-msgid "Meeting - %s"
-msgstr "Møte- %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Appointment - %s"
-msgstr "Avtale - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2237
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Tildelt oppgave - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Task - %s"
-msgstr "Oppgave - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2242
-#: ../calendar/gui/dialogs/comp-editor.c:2285
-#, c-format
-msgid "Memo - %s"
-msgstr "Notat - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2253
-#: ../calendar/gui/dialogs/comp-editor.c:2295
-msgid "No summary"
-msgstr "Ingen sammendrag"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2943
-#: ../calendar/gui/dialogs/comp-editor.c:2997
-#: ../calendar/gui/dialogs/comp-editor.c:3021
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringer som gjøres i denne oppføringen kan bli forkastet hvis det kommer "
 "enoppdatering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
@@ -6330,117 +6468,168 @@ msgstr "Deleger til:"
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "V_arsel"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr "Klikk her for å sette eller fjerne varsling for denne hendelsen"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "Gjeninnt_reffelse"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "Gjør denne hendelsen til repeterende"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Alternativer for sending"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "Sett inn avanserte alternativer for sending"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "Avtale som varer hele _dagen"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "Slår av/på hendelser som varer hele dagen"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "Vis tiden som _opptatt"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "Slår av/på visning av tid som opptatt"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "_Ledig/opptatt"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "Slå opp ledig/opptatt informasjon for deltakerene"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "Av_tale"
 
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.c:2832
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "Denne hendelsen har varsel"
 
-#: ../calendar/gui/dialogs/event-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:941
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "_Delegater"
 
-#: ../calendar/gui/dialogs/event-page.c:943
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "De_ltakere"
 
-#: ../calendar/gui/dialogs/event-page.c:1125
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "Hendelse uten startdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
-#: ../calendar/gui/dialogs/memo-page.c:729
-#: ../calendar/gui/dialogs/task-page.c:888
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1310
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1333
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1340
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1502
-#: ../calendar/gui/dialogs/memo-page.c:769
-#: ../calendar/gui/dialogs/task-page.c:947
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "Valgt organisator har ingen konto lenger."
 
-#: ../calendar/gui/dialogs/event-page.c:1508
-#: ../calendar/gui/dialogs/memo-page.c:775
-#: ../calendar/gui/dialogs/task-page.c:953
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/task-page.c:977
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1965
-#: ../calendar/gui/dialogs/task-page.c:1262
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Legg til"
 
-#: ../calendar/gui/dialogs/event-page.c:2708
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kunne ikke åpne kalender «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2752
-#: ../calendar/gui/dialogs/memo-page.c:985
-#: ../calendar/gui/dialogs/task-page.c:1923
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du opptrer på vegne av %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3050
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag før avtalen"
 msgstr[1] "%d dager før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:3056
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d time før avtalen"
 msgstr[1] "%d timer før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:3062
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minutt før avtalen"
 msgstr[1] "%d minutter før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:3075
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "Tilpass"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3080
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
 #: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:943
@@ -6450,7 +6639,7 @@ msgstr "Tilpass"
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2020
+#: ../plugins/itip-formatter/itip-formatter.c:2022
 #: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
 #: ../widgets/misc/e-dateedit.c:1731
 #: ../widgets/misc/e-signature-combo-box.c:69
@@ -6530,16 +6719,16 @@ msgstr "Ko_ntakter..."
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2448
 msgid "Memo"
 msgstr "Notat"
 
-#: ../calendar/gui/dialogs/memo-page.c:947
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Kan ikke åpne notater i «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1131 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
@@ -6560,7 +6749,7 @@ msgid "_Description:"
 msgstr "_Beskrivelse:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Gruppe:"
@@ -6601,18 +6790,18 @@ msgstr "Denne og fremtidige instanser"
 msgid "All Instances"
 msgstr "Alle instanser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:495
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:816
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "Gjenintreffingsdato er ugyldig"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "på"
 
@@ -6620,7 +6809,7 @@ msgstr "på"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "første"
 
@@ -6629,7 +6818,7 @@ msgstr "første"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:999
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "sekund"
 
@@ -6637,7 +6826,7 @@ msgstr "sekund"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1004
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "tredje"
 
@@ -6645,7 +6834,7 @@ msgstr "tredje"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "fjerde"
 
@@ -6653,13 +6842,13 @@ msgstr "fjerde"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "siste"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Annen dato"
 
@@ -6667,7 +6856,7 @@ msgstr "Annen dato"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "Første til tiende"
 
@@ -6675,7 +6864,7 @@ msgstr "Første til tiende"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1054
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "ellevte til tjuende"
 
@@ -6683,45 +6872,45 @@ msgstr "ellevte til tjuende"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "tjueførste til trettiførste"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "dag"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Legg til unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Fant ikke et utvalg å endre."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Endre unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Fant ikke et utvalg å slette."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
@@ -6772,12 +6961,12 @@ msgstr "uke(r)"
 msgid "year(s)"
 msgstr "år"
 
-#: ../calendar/gui/dialogs/task-details-page.c:409
-#: ../calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "Dato for ferdigstilling er feil"
 
-#: ../calendar/gui/dialogs/task-details-page.c:514
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "Nettside"
 
@@ -6795,8 +6984,8 @@ msgstr "<span weight=\"bold\">Status</span>"
 #: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:634 ../calendar/gui/e-itip-control.c:946
 #: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
 #: ../calendar/gui/print.c:2520 ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:365
@@ -6805,8 +6994,8 @@ msgstr "Fullført"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:360 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-calendar-table.c:559 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Høy"
 
@@ -6815,22 +7004,22 @@ msgstr "Høy"
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:633 ../calendar/gui/print.c:2517
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:362 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1061
+#: ../calendar/gui/e-calendar-table.c:561 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Lav"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1062
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:560
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Normal"
 
@@ -6838,8 +7027,8 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:632 ../calendar/gui/print.c:2514
 #: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Ikke startet"
@@ -6853,7 +7042,7 @@ msgid "Stat_us:"
 msgstr "Stat_us:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:562 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Udefinert"
 
@@ -6870,25 +7059,38 @@ msgstr "_Prioritet:"
 msgid "_Web Page:"
 msgstr "_Nettside:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "Detaljert _status"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+msgid "Click to change or view the status details of the task"
+msgstr "Klikk for å endre/vise detaljer om status for oppgaven"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "Alternativer for _sending"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
 #: ../calendar/gui/tasks-component.c:1326
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Oppgavedetaljer"
 
-#: ../calendar/gui/dialogs/task-page.c:454
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_sator:"
 
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:1880
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åpne oppgaver i «%s»."
@@ -6990,14 +7192,13 @@ msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utløsertype"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3329
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:856
-#: ../shell/e-shell-folder-title-bar.c:586
 msgid "Untitled"
 msgstr "Uten navn"
 
@@ -7035,7 +7236,7 @@ msgstr "Ferdig-dato:"
 #: ../calendar/gui/e-cal-component-preview.c:246
 #: ../calendar/gui/e-itip-control.c:1186
 #: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:1027
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Status:"
 
@@ -7053,12 +7254,12 @@ msgid "Start Date"
 msgstr "Startdato"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "Free"
 msgstr "Ledig"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:612
 #: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Opptatt"
@@ -7098,9 +7299,9 @@ msgstr "Nei"
 #: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:969
 #: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2045
+#: ../plugins/itip-formatter/itip-formatter.c:2047
 #: ../plugins/plugin-manager/plugin-manager.c:73
-#: ../widgets/misc/e-attachment-bar.c:852
+#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "Ukjent"
@@ -7126,9 +7327,9 @@ msgstr "Velg mappe å lagre valgte vedlegg i..."
 msgid "untitled_image.%s"
 msgstr "bilde_uten_navn.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1367
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1568
 #: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
@@ -7146,126 +7347,152 @@ msgstr "_Lagre utvalg"
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:330
+msgid "* No Summary *"
+msgstr "* Ingen sammendrag *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organisator: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:369
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organisator: %s"
+
+#: ../calendar/gui/e-calendar-table.c:400
+msgid "Start: "
+msgstr "Start: "
+
+#: ../calendar/gui/e-calendar-table.c:412
+msgid "Due: "
+msgstr "Ferdig: "
+
+#: ../calendar/gui/e-calendar-table.c:581
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:582
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:583
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:584
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:585
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:586
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:587
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:588
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
+#: ../calendar/gui/e-calendar-table.c:871
 #: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: ../calendar/gui/e-calendar-table.c:954
+#: ../calendar/gui/e-calendar-table.c:1155
 #: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
-#: ../calendar/gui/e-calendar-table.c:1139
+#: ../calendar/gui/e-calendar-table.c:1340
 #: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
 #: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
+#: ../calendar/gui/e-calendar-table.c:1563
 #: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "Ny _oppgave"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1567 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "_Åpne nettside"
 
-#: ../calendar/gui/e-calendar-table.c:1368
+#: ../calendar/gui/e-calendar-table.c:1569
 #: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "Sk_riv ut..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
+#: ../calendar/gui/e-calendar-table.c:1573
 #: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kli_pp ut"
 
-#: ../calendar/gui/e-calendar-table.c:1374
+#: ../calendar/gui/e-calendar-table.c:1575
 #: ../calendar/gui/e-calendar-view.c:1669
 #: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1579 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "Tildel oppg_ave"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1580 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1581
 msgid "_Mark as Complete"
 msgstr "_Merk som fullført"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1582
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk valgte oppgaver som fullført"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1583
 msgid "_Mark as Incomplete"
 msgstr "_Merk som ikke-fullført"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1584
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Merk valgte oppgaver som ikke-fullført"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Delete Selected Tasks"
 msgstr "Sle_tt valgte oppgaver"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1826
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klikk for å legge til en oppgave"
@@ -7358,7 +7585,7 @@ msgstr "_Videresend som iCalendar..."
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1336
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
 #: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
@@ -7376,26 +7603,14 @@ msgstr "Slett denne _hendelsen"
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2227
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organisator: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2231
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organisator: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2247 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2477
 #, c-format
 msgid "Location: %s"
 msgstr "Plassering: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2281
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tidspunkt: %s %s"
@@ -7565,12 +7780,12 @@ msgstr ""
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2033
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "Godtatt"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2036
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
@@ -7578,7 +7793,7 @@ msgstr "Akseptert tentativt"
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
 #: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2039
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "Avslått"
 
@@ -7954,7 +8169,7 @@ msgstr "Tentativ"
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
 #: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2042
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "Delegert"
 
@@ -8696,7 +8911,7 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "Ikke spør meg igjen."
 
@@ -10313,16 +10528,12 @@ msgstr "Le_gg ved"
 msgid "Untitled Message"
 msgstr "Melding uten navn"
 
-#: ../composer/e-composer-actions.c:472 ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "_Vedlegg..."
-
 #: ../composer/e-composer-actions.c:474
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
 #: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "L_ukk"
 
@@ -10330,7 +10541,7 @@ msgstr "L_ukk"
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1343
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
@@ -10371,10 +10582,6 @@ msgstr "S_end"
 msgid "Send this message"
 msgstr "Send denne meldingen"
 
-#: ../composer/e-composer-actions.c:528 ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "Alternativer for _sending"
-
 #: ../composer/e-composer-actions.c:530
 msgid "Insert Send options"
 msgstr "Sett inn alternativer for sending"
@@ -10499,10 +10706,6 @@ msgstr "_Til-felt"
 msgid "Toggles whether the To field is displayed"
 msgstr "Slå av/på visning av Til-feltet"
 
-#: ../composer/e-composer-actions.c:700 ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "Legg ved"
-
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
@@ -10767,7 +10970,7 @@ msgstr "_Lagre melding"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution e-post og kalender"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Gruppevareløsning"
 
@@ -11210,7 +11413,7 @@ msgstr "tiden du spesifiserer"
 
 #: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:399
+#: ../plugins/google-account-setup/google-source.c:404
 msgid "weeks"
 msgstr "uker"
 
@@ -11280,10 +11483,10 @@ msgstr "Brukervalg-kontroll for Evolution e-post"
 msgid "Evolution Network configuration control"
 msgstr "Konfigurasjonskontroll for nettverk i Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:611
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
-#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
-#: ../mail/mail-component.c:757
+#: ../mail/mail-component.c:593 ../mail/mail-component.c:594
+#: ../mail/mail-component.c:758
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "E-post"
@@ -11342,7 +11545,7 @@ msgstr "Spør for hver melding"
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
@@ -11354,7 +11557,7 @@ msgstr "Se etter _nye meldinger hver(t)"
 msgid "minu_tes"
 msgstr "minu_tter"
 
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
@@ -11363,7 +11566,7 @@ msgid "Defaults"
 msgstr "Forvalg"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:130
+#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:131
 #: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Sikkerhet"
@@ -11415,18 +11618,18 @@ msgstr "Legg til signaturskript"
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: ../mail/em-composer-utils.c:1007 ../mail/em-format-quote.c:413
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: ../mail/em-composer-utils.c:1819
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1866
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11434,7 +11637,7 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2009
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
@@ -11535,7 +11738,7 @@ msgstr "Uttrykk"
 msgid "Follow Up"
 msgstr "Følg opp"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1053
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Viktig"
 
@@ -11747,11 +11950,11 @@ msgstr "Viktige meldinger"
 msgid "Messages Not Junk"
 msgstr "Meldinger som ikke er uønsket e-post"
 
-#: ../mail/em-folder-browser.c:1147
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "Søk i konto"
 
-#: ../mail/em-folder-browser.c:1200
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "Søk i alle kontoer"
 
@@ -11802,27 +12005,27 @@ msgstr "Søkemapper"
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Skisser"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2540
+#: ../mail/em-folder-tree-model.c:507 ../mail/em-folder-tree.c:2556
 #: ../mail/mail-component.c:160
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:592
 msgid "Inbox"
 msgstr "Innboks"
 
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Utboks"
 
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Sendt"
 
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Laster..."
 
@@ -11841,85 +12044,78 @@ msgstr "Laster..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:371
+#: ../mail/em-folder-tree.c:380
 #, c-format
 msgid "folder-display|%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1954
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1956
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: ../mail/em-folder-tree.c:994 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Kopier til mappe"
 
-#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ../mail/em-folder-tree.c:1709 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i «%s»"
 
-#: ../mail/em-folder-tree.c:2082 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Vis"
-
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Åpne i _nytt vindu"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2088
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: ../mail/em-folder-tree.c:2091
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Flytt..."
 
-#: ../mail/em-folder-tree.c:2098 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "End_re navn..."
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "O_ppdater"
 
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "T_øm utboks"
 
-#: ../mail/em-folder-tree.c:2106 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Tøm papirkurven"
 
@@ -11928,13 +12124,13 @@ msgstr "_Tøm papirkurven"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopierer «%s» til «%s»"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
 msgid "C_opy"
 msgstr "K_opier"
 
@@ -11956,168 +12152,168 @@ msgstr "Opprett mappe"
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Sletting av e-post feilet"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Du har ikke tilstrekkelige rettigheter til å slette denne meldingen."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:569 ../mail/em-popup.c:580
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Videresend"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1348
 msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1349
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1350
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1353
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as Un_important"
 msgstr "Merk som uv_iktig"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Junk"
 msgstr "Merk som _uønsket e-post"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1359
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppføl_ging..."
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1361
 msgid "_Label"
 msgstr "_Etikett"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "I_ngen"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1365
 msgid "_New Label"
 msgstr "_Ny etikett"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1369
 msgid "Fla_g Completed"
 msgstr "Mer_k som fullført"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1370
 msgid "Cl_ear Flag"
 msgstr "Fj_ern flagg"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1373
 msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1375
 msgid "Search Folder based on _Subject"
 msgstr "Søkemappe ba_sert på emne"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1376
 msgid "Search Folder based on Se_nder"
 msgstr "Søkemappe basert på se_nder"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1377
 msgid "Search Folder based on _Recipients"
 msgstr "Søkemappe basert på mottake_re"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1378
 msgid "Search Folder based on Mailing _List"
 msgstr "Søkemappe basert på e-post_liste"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1383
 msgid "Filter based on Sub_ject"
 msgstr "Filter basert på em_ne"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1384
 msgid "Filter based on Sen_der"
 msgstr "Filter basert på sen_der"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1385
 msgid "Filter based on Re_cipients"
 msgstr "Filter basert på motta_kere"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1386
 msgid "Filter based on _Mailing List"
 msgstr "Filter basert på e-_postliste"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2268 ../mail/em-folder-view.c:2312
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
 msgid "Default"
 msgstr "Forvalgt"
 
-#: ../mail/em-folder-view.c:2530
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "Kunne ikke hente ut melding"
 
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "Henter melding..."
 
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "R_ing til..."
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
 msgstr "Opprett _søkemappe"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "_Fra denne adressen"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "_Til denne adressen"
 
-#: ../mail/em-folder-view.c:3310
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
 
-#: ../mail/em-folder-view.c:3322
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "Klikk for å ringe %s"
 
-#: ../mail/em-folder-view.c:3327
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "Klikk for å skjule/vise adresser"
 
@@ -12407,7 +12603,7 @@ msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:350
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "E-postprogram"
@@ -12555,71 +12751,87 @@ msgid "No Junk plugin available"
 msgstr "Ingen tillegg for uønsket e-post tilgjengelig"
 
 #. green
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Oppgaver"
 
 #. blue
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Senere"
 
-#: ../mail/em-migrate.c:1210
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Lokasjon og hierarki for Evolutions e-postmapper er endret siden Evolution 1."
-"x.\n"
-"\n"
-"Vennligst vent mens Evolution migrere dine mapper..."
+#: ../mail/em-migrate.c:1247
+#, c-format
+msgid "Migrating '%s':"
+msgstr "Migrerer «%s»:"
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kan ikke opprette ny mappe «%s»: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kan ikke kopiere mappe «%s» til «%s»: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Kan ikke søke etter eksisterende postbokser på «%s»: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:1868
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Lokasjon og hierarki for Evolutions e-postmapper er endret siden Evolution 1."
+"x.\n"
+"\n"
+"Vennligst vent mens Evolution migrere dine mapper..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 "Kunne ikke åpne gamle data om meldinger som er beholdt på tjeneren for POP-"
 "tjener «%s»: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Klarte ikke å opprette katalog for bevaring av data på POP3-tjener «%s»: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Kan ikke kopiere data for bevaring på POP3-tjener: «%s»: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Klarte ikke å opprette lokalt e-postlager «%s»: %s"
 
-#: ../mail/em-migrate.c:2851
+#: ../mail/em-migrate.c:2898
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Sammendragsformat for Evolutions e-postmapper bruker sqlite fra Evolution 2.24.\n"
+"\n"
+"Vennligst vent mens Evolution migrere dine mapper..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kunne ikke opprette lokale e-postmapper i «%s»: %s"
 
-#: ../mail/em-migrate.c:2870
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12889,7 +13101,7 @@ msgstr "Katalog for å lagre komponentfiler for e-post."
 
 #: ../mail/evolution-mail.schemas.in.h:40
 msgid "Disable or enable ellipsizing of folder names in folder tree"
-msgstr ""
+msgstr "Slå av eller på bruk av ellipse for mappenavn i mappetreet"
 
 #: ../mail/evolution-mail.schemas.in.h:41
 msgid "Draw spelling error indicators on words as you type."
@@ -13644,142 +13856,148 @@ msgstr "%s e-postliste"
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Maler"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valgt, "
 msgstr[1] "%d valgt, "
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d slettet"
 msgstr[1] "%d slettet"
 
-#: ../mail/mail-component.c:558
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d uønsket e-post"
 msgstr[1] "%d uønsket e-poster"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d skisse"
 msgstr[1] "%d skisser"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendt"
 msgstr[1] "%d sendt"
 
-#: ../mail/mail-component.c:565
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d usendt"
 msgstr[1] "%d usendte"
 
-#: ../mail/mail-component.c:571
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ulest, "
 msgstr[1] "%d uleste, "
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:914
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: ../mail/mail-component.c:914
+#: ../mail/mail-component.c:915
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:916
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: ../mail/mail-component.c:921
+#: ../mail/mail-component.c:922
 msgid "New Mail Folder"
 msgstr "Ny e-postmappe"
 
-#: ../mail/mail-component.c:922
+#: ../mail/mail-component.c:923
 msgid "Mail _Folder"
 msgstr "_E-postmappe"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:924
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
-#: ../mail/mail-component.c:1070
+#: ../mail/mail-component.c:1071
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for e-post."
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1584
 msgid "Error"
 msgstr "Feil"
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1584
 msgid "Errors"
 msgstr "Feil"
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1585
 msgid "Warnings and Errors"
 msgstr "Advarsler og feil"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1586
 msgid "Debug"
 msgstr "Feilsøk"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1586
 msgid "Error, Warnings and Debug messages"
 msgstr "Feil, advarsler og feilsøkingsmeldinger"
 
-#: ../mail/mail-component.c:1712
+#: ../mail/mail-component.c:1713
 msgid "Debug Logs"
 msgstr "Feilsøkingslogger"
 
-#: ../mail/mail-component.c:1726
+#: ../mail/mail-component.c:1727
 msgid "Show _errors in the status bar for"
 msgstr "Vis f_eil i statuslinjen i"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1742
+#: ../mail/mail-component.c:1743
 msgid "second(s)."
 msgstr "sekund(er)."
 
-#: ../mail/mail-component.c:1748
+#: ../mail/mail-component.c:1749
 msgid "Log Messages:"
 msgstr "Loggmeldinger:"
 
-#: ../mail/mail-component.c:1789
+#: ../mail/mail-component.c:1790
 msgid "Log Level"
 msgstr "Loggnivå"
 
-#: ../mail/mail-component.c:1798 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1799 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Tid"
 
-#: ../mail/mail-component.c:1808 ../mail/message-list.c:2429
+#: ../mail/mail-component.c:1809 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../mail/mail-component.c:1817 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1818 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
@@ -14030,8 +14248,8 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Signer _utgående meldinger digitalt (som forvalg)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr "Ikke formatter tekstinnhold i meldinger hvis st_ørrelsen overstiger"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "Ikke formater meldinger når st_ørrelsen overstiger"
 
 #: ../mail/mail-config.glade.h:72
 msgid "Do not mar_k messages as junk if sender is in my addressbook"
@@ -14167,18 +14385,22 @@ msgstr ""
 "Merk: du vil ikke bli spurt etter et passord før du kobler til første gang"
 
 #: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "Alternativet vil ignoreres hvis det finnes treff for egendefinerte meldingshoder for uønsket e-post."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel ID:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -14186,7 +14408,7 @@ msgstr ""
 "Vennligst oppgi et beskrivende navn for denne kontoen i feltet under.\n"
 "Dette navnet vil kun bli brukt som et visningsnavn."
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14194,7 +14416,7 @@ msgstr ""
 "Vennligst skriv inn informasjon om måten du sender e-post. Hvis du ikke er "
 "sikker, kontakt din systemadministrator eller din Internett tjenestetilbyder."
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14204,115 +14426,115 @@ msgstr ""
 "må ikke nødvendigvis fylles ut, hvis du ikke ønsker å inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Vennligst velg mellom følgende alternativer"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spø_r ved sending av meldinger med kun Bcc-mottakere definert"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Sitert"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "_Husk passord"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Husk _passord"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
 msgstr "S_OCKS-vert:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "Kun søk etter bilde av avsender i lokale adressebøker"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "V_elg..."
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "Send kvittering for m_eldinger:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "Forvalg_t skrift:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Velg skrift med fast bredde for bruk ved utskrift av HTML"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Velg skrift med variabel bredde for bruk ved utskrift av HTML"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Utgående e-post"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "Tjener_type: "
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat for sig_nering:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Tabell med signaturer"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
 msgid "Start _typing at the bottom on replying"
 msgstr "S_tart skriving under meldingen ved svar"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "T_ype:"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14320,7 +14542,7 @@ msgstr ""
 "Språklisten som vises her reflekterer kun de språkene du har installert en "
 "ordbok for."
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14330,13 +14552,6 @@ msgstr ""
 "signatur. Navnet du oppgir vil kun brukes for\n"
 "visning på skjermen."
 
-#: ../mail/mail-config.glade.h:151
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"Dette alternativet vil overstyres hvis det finnes treff for egendefinerte "
-"meldingshoder for uønsket e-post."
-
 #: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -14354,7 +14569,7 @@ msgid "Use Authe_ntication"
 msgstr "Bruk aute_ntisering"
 
 #: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:359
+#: ../plugins/google-account-setup/google-source.c:364
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
@@ -14433,7 +14648,7 @@ msgid "_Path:"
 msgstr "S_ti:"
 
 #: ../mail/mail-config.glade.h:178
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "S_pør ved sending av HTML-meldinger til kontakter som ikke ønsker dem"
 
 #: ../mail/mail-config.glade.h:179
@@ -14529,43 +14744,43 @@ msgstr "_Skill mellom små/store bokstaver"
 msgid "Co_mpleted"
 msgstr "Fu_llført"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "F_inn:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Finn i melding"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfølging"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Abonnement på mapper"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Ingen valgt"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "Tj_ener:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Sikkerhetsinformasjon"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Spesifikke mapper"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14573,19 +14788,19 @@ msgstr ""
 "Meldingene du har valgt for oppfølging er listet under.\n"
 "Vennligst velg en handling for oppfølging fra menyen «Flagg»."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "Godt_a lisensen"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Ferdig til:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Flagg:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensen"
 
@@ -14831,11 +15046,6 @@ msgstr "Operasjon avbrutt av bruker."
 msgid "_Save and Close"
 msgstr "L_agre og lukk"
 
-#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Fil"
-
 #: ../mail/mail-signature-editor.c:355
 msgid "Edit Signature"
 msgstr "Rediger signatur"
@@ -15501,78 +15711,79 @@ msgstr "T_øm"
 msgid "_Open Messages"
 msgstr "_Åpne meldinger"
 
-#: ../mail/message-list.c:1050
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Ulest"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Besvart"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: ../mail/message-list.c:1059
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Høyere"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Høyest"
 
-#: ../mail/message-list.c:1594 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1601 ../plugins/itip-formatter/itip-view.c:204
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../mail/message-list.c:1610 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: ../mail/message-list.c:1622 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:3884
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3885 ../mail/message-list.c:4321
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: ../mail/message-list.c:4170
+#: ../mail/message-list.c:4176
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15580,7 +15791,7 @@ msgstr ""
 "Ingen meldinger passer dine søkekriterier. Du kan enten tømme søket med "
 "menyoppføringen Søk->Tøm eller endre det."
 
-#: ../mail/message-list.c:4172
+#: ../mail/message-list.c:4178
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
@@ -15698,6 +15909,7 @@ msgstr ""
 "påminnelse om vedlegg."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Nøkkelord"
 
@@ -15968,8 +16180,7 @@ msgstr "Automatiske kontakter"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+msgid "_Auto-create addressbook entries when replying to messages"
 msgstr "Opprett oppføringer i adresseboken _automatisk når du svarer på e-post"
 
 #: ../plugins/bbdb/bbdb.c:571
@@ -15982,11 +16193,8 @@ msgstr "Kontakter for lynmeldinger"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
-msgstr ""
-"Synkroniser kontaktinformasjon og bilder fra vennelisten i Pidgin periodisk"
+msgid "Synchronize contact info and images from Pidgin buddy list"
+msgstr "Synkroniser kontaktinformasjon og bilder fra vennelisten i Pidgin"
 
 #: ../plugins/bbdb/bbdb.c:607
 msgid "Select Address book for Pidgin buddy list"
@@ -16070,7 +16278,7 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:352
+#: ../plugins/google-account-setup/google-source.c:357
 msgid "Use _SSL"
 msgstr "Bruk _SSL"
 
@@ -16092,7 +16300,7 @@ msgstr "Gir kjernefunksjoner for lokale kalendere."
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:376
+#: ../plugins/google-account-setup/google-source.c:381
 msgid "Re_fresh:"
 msgstr "O_ppdater"
 
@@ -16232,10 +16440,26 @@ msgstr ""
 "Gir grunnleggende funksjonalitet for markering av forvalgt kalender eller "
 "adressebok."
 
-#: ../plugins/email-custom-header/email-custom-header.c:535
+#: ../plugins/email-custom-header/email-custom-header.c:562
 msgid "_Custom Header"
 msgstr "E_gendefinert meldingshode"
 
+#: ../plugins/email-custom-header/email-custom-header.c:883
+msgid "Key"
+msgstr "Nøkkel"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Verdier"
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
 msgid "Email Custom Header"
 msgstr "Egendefinert meldingshode i e-post"
@@ -16612,7 +16836,7 @@ msgstr "Mappestørrelse"
 msgid "User"
 msgstr "Bruker"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Abonner på annen brukers mappe"
@@ -16943,10 +17167,14 @@ msgid "Could not update out-of-office state"
 msgstr "Kunne ikke oppdatere «ute fra kontoret»-tilstand"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "Exchange-kontoen er frakoblet."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16974,32 +17202,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Kunne ikke oppdatere delegater:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Mappen eksisterer allerede"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Mappen eksisterer ikke"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Mappen er frakoblet"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 #: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "Vanlig feil"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "Global katalogtjener kan ikke nås"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -17007,72 +17235,72 @@ msgstr ""
 "Hvis OWA bruker en annen sti må denne oppgis i konfigurasjonsdialogen for "
 "kontoen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "E-postboks for {0} er ikke på denne tjeneren."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "Se til at URL-en er riktig og prøv igjen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "Se til at tjenernavnet er stavet riktig og prøv igjen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr "Se til at brukernavnet og passordet er riktig og prøv igjen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "Ingen global katalogtjener er konfigurert for denne kontoen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "Ingen postboks for bruker {0} på {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Bruker {0} finnes ikke"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "Endring av passord fullført."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 "Vennligst oppgi ID for delegat eller fjern valget for å sende som delegat."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Vennlist sjekk at navnet på Global Catalog Server er korrekt."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Vennligst start Evolution på nytt for at endringene skal aktiveres"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Velg en bruker."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "Tjeneren avslo passordet fordi det er for svakt."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Exchange-kontoen vil bli deaktivert når du avslutter Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Exchange-kontoen vil bli fjernet når du avslutter Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Exchange-tjeneren samspiller ikke med Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17080,7 +17308,7 @@ msgstr ""
 "Denne tjeneren kjører Exchange 5.5. Exchange Connector \n"
 "støtter bare Microsoft Exchange 2000 og 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17094,59 +17322,59 @@ msgstr ""
 "\n"
 "Eller du kan ha skrevet inn feil passord."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "Prøv igjen med et annet passord."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "Klarte ikke å legge til bruker i listen over tilgangskontroll:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Klarte ikke å redigere delegater."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Ukjent feil ved oppslag av {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error."
 msgstr "Ukjent feil."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Ukjent type"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Operasjonen er ikke støttet"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "Du nærmer deg den tilgjengelige kvoten for lagring av e-post på denne "
 "tjeneren."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr "Du kan kun sende en melding på vegne av en bruker om gangen."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "Du kan ikke gjøre deg selv til din egen delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Du har overgått din kvote for lagring av e-post på denne tjeneren."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "Du kan bare konfigurere en Exchange-konto."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -17154,14 +17382,14 @@ msgstr ""
 "Din nåværende bruk er: {0} KB. Prøv å frigjøre litt plass ved å slette noen "
 "meldinger."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr ""
 "Din nåværende bruk er: {0} KB. Du vil ikke kunne sende eller motta e-post nå."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17169,19 +17397,19 @@ msgstr ""
 "Din nåværende bruk er: {0} KB. Du vil ikke kunne sende e-post før du frigjør "
 "litt plass ved å slette noen meldinger."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "Passordet ditt har forfallt."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} kan ikke legges til i listen over tilgangskontroll"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} er allerede en delegat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} finnes allerede på listen"
 
@@ -17302,14 +17530,29 @@ msgstr "Fjern abonnement på mapper"
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:73
+#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+msgid "<b>Server</b>"
+msgstr "<b>Tjener</b> "
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+msgid "Username:"
+msgstr "Brukernavn:"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:230
+msgid "Update every"
+msgstr "Oppdaterer hver"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "Et tillegg for å sette opp kalenderressurser fra Google."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "Et tillegg for å sette opp kalenderressurser og kontakter fra Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
@@ -17418,12 +17661,6 @@ msgstr "Kall tilbake e-post"
 msgid "Add Send Options to groupwise messages"
 msgstr "Legg til sendingsalternativer for GroupWise-meldinger"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Alternativer for sending"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Tillegg for funksjoner vedrørende GroupWise-kontoer."
@@ -17486,14 +17723,18 @@ msgid "This is a recurring meeting"
 msgstr "Dette er et repeterende møte"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-msgid "What would you like to {0}?"
-msgstr "Hva ønsker du å {0}?"
+msgid "Would you like to accept it?"
+msgstr "Vil du godta den?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "Would you like to decline it?"
+msgstr "Vil du avslå den?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
 msgid "You cannot share folder with specified user &quot;{0}&quot;"
 msgstr "Du kan ikke dele en mappe med oppgitt bruker &quot;{0}&quot;"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "You have to specify a user name whom you want to add to the list"
 msgstr "Du må oppgi et brukernavn du ønsker å legge til på listen"
 
@@ -18000,31 +18241,31 @@ msgstr ""
 "Du må lagre filen og importere kalenderen for å prosessere alle disse "
 "oppføringene"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2147
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "Dettee møtet gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2150
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "Denne oppgaven gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2153
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "Dette notatet gjeninntreffer"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2382
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "_Slett melding etter utført handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2392
-#: ../plugins/itip-formatter/itip-formatter.c:2424
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "Søk etter konflikter"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2407
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Velg kalendere som skal gjennomsøkes for å finne møtekonflikter"
 
@@ -18457,42 +18698,42 @@ msgid "_Update"
 msgstr "_Oppdater"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1010
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "Start-tid:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "Slutt-tid:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1035
-#: ../plugins/itip-formatter/itip-view.c:1085
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../plugins/itip-formatter/itip-view.c:1071
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "Send _reply to sender"
 msgstr "Send sva_r til avsender"
 
-#: ../plugins/itip-formatter/itip-view.c:1099
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Send _updates to attendees"
 msgstr "Send _oppdateringer til deltakere"
 
-#: ../plugins/itip-formatter/itip-view.c:1108
+#: ../plugins/itip-formatter/itip-view.c:1110
 msgid "_Apply to all instances"
 msgstr "B_ruk på alle instanser"
 
-#: ../plugins/itip-formatter/itip-view.c:1117
+#: ../plugins/itip-formatter/itip-view.c:1119
 msgid "Show time as _free"
 msgstr "Vis tid som _ledig"
 
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "_Oppgaver :"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "Notater :"
 
@@ -18600,12 +18841,20 @@ msgstr "Om ikonet skal blinke eller ikke."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Im nye meldinger kun skal varsles i innboksen."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "Genererer en _D-Bus-melding"
 
+#: ../plugins/mail-notification/mail-notification.c:361
+msgid "Evolution's Mail Notification"
+msgstr "Varsling om ny e-post for Evolution"
+
+#: ../plugins/mail-notification/mail-notification.c:382
+msgid "Mail Notification Properties"
+msgstr "Egenskaper for varsling om ny e-post"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:440
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18620,55 +18869,55 @@ msgstr[1] ""
 "Du har mottatt %d nye meldinger\n"
 "i %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:445
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Du har mottatt %d ny melding."
 msgstr[1] "Du har mottatt %d nye meldinger."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:462
 msgid "New email"
 msgstr "Ny e-post"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:519
 msgid "Show icon in _notification area"
 msgstr "Vis ikon i varslingsområdet"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:522
 msgid "B_link icon in notification area"
 msgstr "B_linkende ikon i varslingsområdet"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:524
 msgid "Popup _message together with the icon"
 msgstr "Vis _melding sammen med ikonet"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:705
 msgid "_Play sound when new messages arrive"
 msgstr "S_pill en lydfil når nye meldinger ankommer"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:711
 msgid "_Beep"
 msgstr "_Pip"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:712
 msgid "Play _sound file"
 msgstr "_Spill en lydfil"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:723
 msgid "Specify _filename:"
 msgstr "Spesifiser _filnavn:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:724
 msgid "Select sound file"
 msgstr "Velg en lydfil"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:725
 msgid "Pl_ay"
 msgstr "Sp_ill"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:782
 msgid "Notify new messages for _Inbox only"
 msgstr "Varslingsmelding kun for _innboks"
 
@@ -19262,7 +19511,6 @@ msgid "MIME Type"
 msgstr "MIME-type"
 
 #: ../plugins/save-attachments/save-attachments.c:347
-#: ../ui/evolution-editor.xml.h:12
 msgid "Save"
 msgstr "Lagre"
 
@@ -19467,6 +19715,28 @@ msgstr "Vis meldingstråder etter emne"
 msgid "F_all back to threading messages by subject"
 msgstr "F_all tilbake til tråding av meldinger etter emne"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr "Liste med nøkkelord-/verdi-par for mal-tillegg for å sette inn i en meldingskropp."
+
+#: ../plugins/templates/templates.c:614
+msgid "No title"
+msgstr "Ingen tittel"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Lagre som _mal"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Lagre som mal"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Tillegg for å lage maler av skisser"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "Et enkelt tillegg som buker ytnef til å dekode tnef-vedlegg."
@@ -19833,29 +20103,9 @@ msgstr "Importer en en_kelt fil"
 msgid "Evolution Preferences"
 msgstr "Evolution brukervalg"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Ingen mappenavn spesifisert."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Mappenavn kan ikke inneholde linjeskift."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Mappenavn kan ikke inneholde tegnet «/»."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Mappenavn kan ikke inneholde tegnet «#»."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "«.» og «..» er reserverte mappenavn."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:335
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19881,45 +20131,51 @@ msgstr "Bug buddy kunne ikke kjøres."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:742
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr "Kjartan Maraas <kmaraas@gnome.org>"
 
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Evolution nettsted"
 
-#: ../shell/e-shell-window-commands.c:771
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Feil under åpning av nettside med ofte stilte spørsmål"
 
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
-#: ../shell/e-shell-window.c:384
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:377
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
-"Evolution er koblet til. Klikk på denne knappen for å arbeide frakoblet."
+"Evolution er koblet til.\n"
+"Klikk på denne knappen for å arbeide frakoblet."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution er i ferd med å koble fra."
 
-#: ../shell/e-shell-window.c:398
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:391
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
-"Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
+"Evolution er frakoblet.\n"
+"Klikk på denne knappen for å arbeide tilkoblet."
 
-#: ../shell/e-shell-window.c:807
+#: ../shell/e-shell-window.c:780
 #, c-format
 msgid "Switch to %s"
 msgstr "Bytt til %s"
@@ -19949,9 +20205,9 @@ msgstr "Kan ikke registrere i OAF"
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: ../shell/e-user-creatable-items-handler.c:671
-#: ../shell/e-user-creatable-items-handler.c:681
-#: ../shell/e-user-creatable-items-handler.c:686
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "Ny"
 
@@ -20871,7 +21127,7 @@ msgstr "Lagre kontakter i valgt mappe som VCard"
 msgid "Select All"
 msgstr "Velg alle"
 
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
 msgstr "Velg _alle"
 
@@ -21078,192 +21334,6 @@ msgstr "Arbeidsuke"
 msgid "_Open Appointment"
 msgstr "_Åpne avtale"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "klikk her for å legge ved en fil"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Klikk her for å lukke dette vinduet"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Klikk her for å lagre dette vinduet"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "klikk her for å vise tilgjengelig hjelp"
-
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "Lukk"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Kopier valgt tekst til utklippstavlen"
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Klipp ut valgt tekst til utklippstavlen"
-
-#: ../ui/evolution-editor.xml.h:10
-msgid "I_nsert"
-msgstr "Sett i_nn"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Lim inn tekst fra utklippstavlen"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Velg all tekst"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_Hjelp"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Alternativer"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Avtale som varer hele dagen"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Avtale som varer hele _dagen"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Klassifiser som konfidensiell"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Klassifiser som privat"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Klassifiser som offentlig"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Klikk her for å sette eller fjerne varsling for denne hendelsen"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Sett inn avanserte alternativer for sending"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Gjør denne hendelsen til repeterende"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "O_ffentlig"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Slå opp ledig/opptatt informasjon for deltakerene"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "R_olle-felt"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "Alter_nativer for sending"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Vis tiden som _opptatt"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Tids_sone"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Slår av/på visning av deltaker-feltet"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Slår av/på visning av RSVP-feltet"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Slår av/på visning av rolle-feltet"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Slår av/på visning av status-feltet"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Slår av/på visning av tidssone"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Slår av/på visning av kategorier"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Slår av/på hendelser som varer hele dagen"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Slår av/på visning av tid som opptatt"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "V_arsel"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Kategorier"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "K_lassifisering"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Konfidensiell"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Ledig/opptatt"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Privat"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "Gjeninnt_reffelse"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "_Status-felt"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "_Type felt"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktiv e-postoperasjon"
@@ -21965,6 +22035,10 @@ msgstr "_Zoom"
 msgid "_Zoom In"
 msgstr "_Zoom inn"
 
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Lukk"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Hovedverktøylinje"
@@ -22001,22 +22075,6 @@ msgstr "Vis valgt notat"
 msgid "_Open Memo"
 msgstr "_Åpne notat"
 
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Klikk endre/vis status for oppgaven"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Detaljert status"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Tidssone"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "Detaljert _status"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Kopier valgte oppgaver"
@@ -22469,36 +22527,10 @@ msgstr "Type visning"
 msgid "Type of view:"
 msgstr "Type visning:"
 
-#: ../widgets/misc/e-attachment-bar.c:108
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../widgets/misc/e-attachment-bar.c:114
-#, c-format
-msgid "%.1f KB"
-msgstr "%.1f KB"
-
-#: ../widgets/misc/e-attachment-bar.c:117
-#, c-format
-msgid "%.1f MB"
-msgstr "%.1f MB"
-
-#: ../widgets/misc/e-attachment-bar.c:120
-#, c-format
-msgid "%.1f GB"
-msgstr "%.1f GB"
-
-#: ../widgets/misc/e-attachment-bar.c:1168
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Vedleggsfelt"
 
-#: ../widgets/misc/e-attachment-bar.c:1414
-msgid "Recent Docu_ments"
-msgstr "Siste doku_menter"
-
 #: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
 #: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
@@ -22577,16 +22609,16 @@ msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Minste bredde"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Minste bredde"
 
@@ -22850,6 +22882,14 @@ msgstr ""
 "Mus-basert interaktivt kartfelt for å velge tidssone. Tastaturbrukere må "
 "velge tiddsone fra kombinasjonsboksen nedenfor."
 
+#: ../widgets/misc/e-online-button.c:112
+msgid "Online"
+msgstr "Tilkoblet"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr "Knappetilstanden er tilkoblet"
+
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Synkroniser med:"
@@ -22874,52 +22914,52 @@ msgstr "Oppdater modell"
 msgid "Column width"
 msgstr "Kolonnebredde"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "Søk"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "Klikk her for å endre søketype"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "_Finn nå "
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "ID for oppføring"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Tekst"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1009
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "_Vis: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1026
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "Sø_k: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1038
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " _i "
 
@@ -23075,14 +23115,14 @@ msgid "_When opened:"
 msgstr "_Ved åpning:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:289
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:295
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
@@ -23298,81 +23338,81 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d oppføring)"
 msgstr[1] "%s (%d oppføringer)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Skiftende farger på rader"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
 #: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "Horisontalt rutenett for tegning"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
 #: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "Vertikalt rutenett for tegning"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
 #: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "Tegn fokus"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Markørmodus"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Utvalgsmodell"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
 #: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "Lengdeterskel"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
 #: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "Enhetlig høyde på rad"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "Frosset"
 
@@ -23448,24 +23488,24 @@ msgstr "Sorteringsinformasjon"
 msgid "Tree"
 msgstr "Tre"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Tabellhode"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Modell for tabell"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Pekerrad"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
 #: ../widgets/table/e-tree.c:3356
 msgid "Always search"
 msgstr "Alltid søk"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Bruk klikk for å legge til"
 
diff --git a/po/ps.po b/po/ps.po
new file mode 100644
index 0000000000..f5337b68b9
--- /dev/null
+++ b/po/ps.po
@@ -0,0 +1,22868 @@
+# Pashto translation of Evolution
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the evolution package.
+# Zabeeh Khan <zabeehkhan@gmail.com>, 2008.
+#
+#: ../shell/main.c:683
+msgid ""
+msgstr ""
+"Project-Id-Version: evolution.head\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-07-23 23:48+0200\n"
+"PO-Revision-Date: 2008-07-23 21:37-0800\n"
+"Last-Translator: Zabeeh Khan <zabeehkhan@gmail.com>\n"
+"Language-Team: Pashto <pathanisation@goolgegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-Language: Pashto, Pushto\n"
+"X-Poedit-Country: AFGHANISTAN\n"
+
+#: ../a11y/addressbook/ea-addressbook-view.c:94
+#: ../a11y/addressbook/ea-addressbook-view.c:103
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution addressbook"
+msgstr "اېوليوشن پته کتاب"
+
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:228
+msgid "New Contact"
+msgstr "نوی اړيکلور"
+
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:236
+msgid "New Contact List"
+msgstr "نوی اړيکلور لړ"
+
+#: ../a11y/addressbook/ea-minicard-view.c:161
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../a11y/addressbook/ea-minicard.c:31
+msgid "Open"
+msgstr "پرانيستل"
+
+#: ../a11y/addressbook/ea-minicard.c:141
+msgid "Contact List: "
+msgstr ":اړيکلور لړ"
+
+#: ../a11y/addressbook/ea-minicard.c:142
+msgid "Contact: "
+msgstr ":اړيکلوری"
+
+#: ../a11y/addressbook/ea-minicard.c:168
+msgid "evolution minicard"
+msgstr "اېوليوشن مينيکارډ"
+
+#: ../a11y/calendar/ea-cal-view-event.c:266
+msgid "It has alarms."
+msgstr ".دا خبرونې لري"
+
+#: ../a11y/calendar/ea-cal-view-event.c:269
+msgid "It has recurrences."
+msgstr ".دا بياپېښېدنې لري"
+
+#: ../a11y/calendar/ea-cal-view-event.c:272
+msgid "It is a meeting."
+msgstr ".دا يوه کتنه ده"
+
+#: ../a11y/calendar/ea-cal-view-event.c:278
+#, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr ".%s کليز پېښه: لنډيز دا دی"
+
+#: ../a11y/calendar/ea-cal-view-event.c:280
+msgid "Calendar Event: It has no summary."
+msgstr ".کليز پېښه: کوم لنډيز نه لري"
+
+#: ../a11y/calendar/ea-cal-view-event.c:300
+msgid "calendar view event"
+msgstr "کليز ليد پېښه"
+
+#: ../a11y/calendar/ea-cal-view-event.c:528
+msgid "Grab Focus"
+msgstr "منځواله نيول"
+
+#: ../a11y/calendar/ea-cal-view.c:302
+msgid "New Appointment"
+msgstr "نوې ټاکنه"
+
+#: ../a11y/calendar/ea-cal-view.c:303
+msgid "New All Day Event"
+msgstr "نوې ټوله ورځ پېښه"
+
+#: ../a11y/calendar/ea-cal-view.c:304
+msgid "New Meeting"
+msgstr "نوې کتنه"
+
+#: ../a11y/calendar/ea-cal-view.c:305
+msgid "Go to Today"
+msgstr "نن ته ورتلل"
+
+#: ../a11y/calendar/ea-cal-view.c:306
+msgid "Go to Date"
+msgstr "نېټې ته ورتلل"
+
+#: ../a11y/calendar/ea-day-view-main-item.c:303
+#: ../a11y/calendar/ea-week-view-main-item.c:301
+msgid "a table to view and select the current time range"
+msgstr ""
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:150
+#, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "پېښه لري. %d دا"
+msgstr[1] "پېښې لري. %d دا"
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:152
+msgid "It has no events."
+msgstr ".دا کومه پېښه نه لري"
+
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../a11y/calendar/ea-day-view.c:162
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "%s .%s ‎:دنده اونۍ ليد"
+
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../a11y/calendar/ea-day-view.c:168
+#, c-format
+msgid "Day View: %s. %s"
+msgstr "%s .%s ‎:ورځ کوت"
+
+#: ../a11y/calendar/ea-day-view.c:199
+msgid "calendar view for a work week"
+msgstr "د يوې دنده اونۍ کليز ليد"
+
+#: ../a11y/calendar/ea-day-view.c:201
+msgid "calendar view for one or more days"
+msgstr "د يو يا ډېرو ورځو کليز ليد"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:188
+#: ../calendar/gui/calendar-component.c:758
+msgid "%A %d %b %Y"
+msgstr "%A %d %b %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../calendar/gui/calendar-component.c:761
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
+#: ../calendar/gui/e-week-view-main-item.c:340
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:193
+#: ../a11y/calendar/ea-gnome-calendar.c:198
+#: ../a11y/calendar/ea-gnome-calendar.c:200
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:768
+#: ../calendar/gui/calendar-component.c:770
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:217
+#: ../a11y/calendar/ea-gnome-calendar.c:223
+#: ../a11y/calendar/ea-gnome-calendar.c:229
+#: ../a11y/calendar/ea-gnome-calendar.c:231
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:797
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../a11y/calendar/ea-gnome-calendar.c:221
+#: ../calendar/gui/calendar-component.c:787
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
+#: ../calendar/gui/e-week-view-main-item.c:354
+msgid "%d %b"
+msgstr "%d %b"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:247
+#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../calendar/importers/icalendar-importer.c:766
+msgid "Gnome Calendar"
+msgstr "جنومي کليز"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:290
+msgid "search bar"
+msgstr "پلټون پټه"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:291
+msgid "evolution calendar search bar"
+msgstr "د اېوليوشن کليز پلټون پټه"
+
+#: ../a11y/calendar/ea-jump-button.c:149
+msgid "Jump button"
+msgstr "ټوپ تڼۍ"
+
+#: ../a11y/calendar/ea-jump-button.c:158
+msgid "Click here, you can find more events."
+msgstr ".دلته کېکاږﺉ، تاسو نورې پېښې هم موندلی شئ"
+
+#: ../a11y/calendar/ea-week-view.c:157
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "%s .%s ‎:مياشت ليد"
+
+#: ../a11y/calendar/ea-week-view.c:161
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "%s .%s ‎:اونۍ ليد"
+
+#: ../a11y/calendar/ea-week-view.c:192
+msgid "calendar view for a month"
+msgstr "د يوې مياشتې لپاره کليز ليد"
+
+#: ../a11y/calendar/ea-week-view.c:194
+msgid "calendar view for one or more weeks"
+msgstr "د يوې يا ډېرو اونېو لپاره کليز ليد"
+
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+msgid "popup"
+msgstr "بړبوکول"
+
+#. action name
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+msgid "popup a child"
+msgstr "ماشمو بړبوکول"
+
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+msgid "edit"
+msgstr "سمون"
+
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+msgid "begin editing this cell"
+msgstr "د دې خونې سمول پېلول"
+
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+msgid "toggle"
+msgstr "څرنګتياونج"
+
+#. action name
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
+msgid "toggle the cell"
+msgstr "خونه څرنګتياونجول"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+msgid "expand"
+msgstr "غځول"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+msgid "expands the row in the ETree containing this cell"
+msgstr ""
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+msgid "collapse"
+msgstr "وېجاړېدل"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+msgid "collapses the row in the ETree containing this cell"
+msgstr ""
+
+#: ../a11y/e-table/gal-a11y-e-cell.c:107
+msgid "Table Cell"
+msgstr "لښتيال خونه"
+
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
+#: ../widgets/table/e-table-click-to-add.c:581
+msgid "click to add"
+msgstr "د زياتولو لپاره کېکاږﺉ"
+
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
+msgid "click"
+msgstr "کېکاږﺉ"
+
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
+msgid "sort"
+msgstr "اڼل"
+
+#: ../a11y/widgets/ea-calendar-item.c:298
+#: ../a11y/widgets/ea-calendar-item.c:304
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../a11y/widgets/ea-calendar-item.c:306
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "%s نه تر‎ ‎%s کليز: له‎"
+
+#: ../a11y/widgets/ea-calendar-item.c:341
+msgid "evolution calendar item"
+msgstr "اېوليوشن کليز توکی"
+
+#: ../a11y/widgets/ea-combo-button.c:39
+msgid "Combo Button"
+msgstr "تړنګ تڼۍ"
+
+#: ../a11y/widgets/ea-combo-button.c:49
+msgid "Activate Default"
+msgstr "تلواله چارندول"
+
+#: ../a11y/widgets/ea-combo-button.c:51
+msgid "Popup Menu"
+msgstr "بړبوکیزه غورنۍ"
+
+#: ../a11y/widgets/ea-expander.c:39
+msgid "Toggle Attachment Bar"
+msgstr "څرنګتياونج نښلن پټه"
+
+#: ../a11y/widgets/ea-expander.c:49
+msgid "activate"
+msgstr "چارندول"
+
+#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:2
+msgid ""
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:3
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:4
+msgid "Address '{0}' already exists."
+msgstr ".پته د مخکې نه شتون لري '{0}'"
+
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Cannot add new contact"
+msgstr "نوی اړيکلوری نه شي زياتولی"
+
+#: ../addressbook/addressbook.error.xml.h:6
+msgid "Cannot move contact."
+msgstr ".اړيکلور نه شي خوځولی"
+
+#: ../addressbook/addressbook.error.xml.h:7
+msgid "Category editor not available."
+msgstr ".ټولۍ سمونګر نه شته"
+
+#: ../addressbook/addressbook.error.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:9
+msgid "Could not get schema information for LDAP server."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:10
+msgid "Could not remove addressbook."
+msgstr "پته کتاب نه شي ړنګولی"
+
+#: ../addressbook/addressbook.error.xml.h:11
+msgid ""
+"Currently you can access only GroupWise System Address Book from Evolution. "
+"Please use some other GroupWise mail client once, to get your GroupWise "
+"Frequent Contacts and GroupWise Personal Contacts folders."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:12
+msgid "Delete address book '{0}'?"
+msgstr "پته کتاب ړنګول غواړﺉ؟ ‎'{0}'"
+
+#: ../addressbook/addressbook.error.xml.h:13
+msgid "Error loading addressbook."
+msgstr ".د پته کتاب په لېښلو کې تېروتنه"
+
+#: ../addressbook/addressbook.error.xml.h:14
+msgid "Error saving {0} to {1}: {2}"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:15
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
+
+#. Unknown error
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+msgid "Failed to delete contact"
+msgstr "د اړيکلوري په ړنګولو کې پاتې راغی"
+
+#: ../addressbook/addressbook.error.xml.h:17
+msgid "GroupWise Address book creation:"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:18
+msgid "LDAP server did not respond with valid schema information."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:19
+msgid "Server Version"
+msgstr "د پالنګر نسخه"
+
+#: ../addressbook/addressbook.error.xml.h:20
+msgid "Some features may not work properly with your current server"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:23
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:24
+msgid "This address book will be removed permanently."
+msgstr ".دا پته کتاب به د تل لپاره وړنګول شي"
+
+#: ../addressbook/addressbook.error.xml.h:25
+msgid "This addressbook could not be opened."
+msgstr ".دا پته کتاب نه شي پرانيستل کېدی"
+
+#: ../addressbook/addressbook.error.xml.h:26
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:27
+msgid ""
+"This addressbook server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:28
+msgid "This server does not support LDAPv3 schema information."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:29
+msgid "Unable to open addressbook"
+msgstr "پته کتاب نه شي پرانيستلی"
+
+#: ../addressbook/addressbook.error.xml.h:30
+msgid "Unable to perform search."
+msgstr ".پلټون نه شي ترسره کولی"
+
+#: ../addressbook/addressbook.error.xml.h:31
+msgid "Unable to save {0}."
+msgstr ".نه شي ساتلی ‎{0}"
+
+#: ../addressbook/addressbook.error.xml.h:32
+msgid "Would you like to save your changes?"
+msgstr "تاسو غواړﺉ چې خپل بدلونونه وساتئ؟"
+
+#: ../addressbook/addressbook.error.xml.h:33
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:34
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to "
+"a supported version"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:36
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:37
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
+#: ../plugins/groupwise-features/junk-settings.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:18
+msgid "_Add"
+msgstr "زياتول_"
+
+#: ../addressbook/addressbook.error.xml.h:39
+msgid "_Discard"
+msgstr "بندول_"
+
+#: ../addressbook/addressbook.error.xml.h:40
+msgid "_Do not save"
+msgstr "نه ساتل_"
+
+#: ../addressbook/addressbook.error.xml.h:41
+msgid "_Resize"
+msgstr "بياکچول_"
+
+#: ../addressbook/addressbook.error.xml.h:42
+msgid "_Use as it is"
+msgstr "کارول لکه څنګه چې دی_"
+
+#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+msgid "{0}"
+msgstr "{0}"
+
+#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
+#: ../addressbook/addressbook.error.xml.h:46
+msgid "{1}"
+msgstr "{1}"
+
+#: ../addressbook/conduit/address-conduit.c:299
+msgid "Default Sync Address:"
+msgstr ":تلواله هممهالي پته"
+
+#: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
+msgid "Could not load addressbook"
+msgstr "پته کتاب نه شي لېښلی"
+
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
+msgid "Could not read pilot's Address application block"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Autocompletion"
+msgstr "خپلبشپړېدنه"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "C_ontacts"
+msgstr "ا_ړيکلوري"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Certificates"
+msgstr "برېليکونه"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Configure autocomplete here"
+msgstr "خپلبشپړېدنه دلته وسازوﺉ"
+
+#. Create the contacts group
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:580
+msgid "Contacts"
+msgstr "اړيکلوري"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Address Book"
+msgstr "اېوليوشن پته کتاب"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Address Book address popup"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Address Book address viewer"
+msgstr "اېوليوشن پته کتاب پته ليدانی"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Address Book card viewer"
+msgstr "اېوليوشن پته کتاب کارډ ليدانی"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Address Book component"
+msgstr "اېوليوشن پته کتاب رغتوکی"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manage your S/MIME certificates here"
+msgstr ""
+
+#. create the local source group
+#. On This Computer is always first and Search Folders is always last
+#: ../addressbook/gui/component/addressbook-component.c:144
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:237
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
+#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
+msgid "On This Computer"
+msgstr "په دې سولګر کې"
+
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person task list
+#. Create the default Person addressbook
+#. orange
+#: ../addressbook/gui/component/addressbook-component.c:152
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
+msgid "Personal"
+msgstr "وګړيز"
+
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:163
+#: ../addressbook/gui/component/addressbook-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "پالنګرونو LDAP په"
+
+#: ../addressbook/gui/component/addressbook-component.c:229
+msgid "_Contact"
+msgstr "اړيکلوری_"
+
+#: ../addressbook/gui/component/addressbook-component.c:230
+msgid "Create a new contact"
+msgstr "نوی اړيکلوری جوړول"
+
+#: ../addressbook/gui/component/addressbook-component.c:237
+msgid "Contact _List"
+msgstr "اړيکلور _لړ"
+
+#: ../addressbook/gui/component/addressbook-component.c:238
+msgid "Create a new contact list"
+msgstr "نوی اړيکلور لړ جوړول"
+
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1192
+msgid "New Address Book"
+msgstr "نوی پته کتاب"
+
+#: ../addressbook/gui/component/addressbook-component.c:245
+msgid "Address _Book"
+msgstr "پته _کتاب"
+
+#: ../addressbook/gui/component/addressbook-component.c:246
+msgid "Create a new address book"
+msgstr "نوی پته کتاب جوړول"
+
+#: ../addressbook/gui/component/addressbook-component.c:409
+msgid "Failed upgrading Address Book settings or folders."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-config.c:315
+msgid "Base"
+msgstr "بنسټ"
+
+#: ../addressbook/gui/component/addressbook-config.c:516
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+msgid "_Type:"
+msgstr ":ډول_"
+
+#: ../addressbook/gui/component/addressbook-config.c:618
+msgid "Copy _book content locally for offline operation"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-config.c:967
+#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../calendar/gui/dialogs/calendar-setup.c:388
+#: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2368
+#: ../smime/gui/smime-ui.glade.h:28
+msgid "General"
+msgstr "ټولګړي"
+
+#: ../addressbook/gui/component/addressbook-config.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:385
+msgid "Address Book"
+msgstr "پته کتاب"
+
+#: ../addressbook/gui/component/addressbook-config.c:972
+msgid "Server Information"
+msgstr "د پالنګر خبرتياوې"
+
+#: ../addressbook/gui/component/addressbook-config.c:974
+msgid "Authentication"
+msgstr "کرونه"
+
+#: ../addressbook/gui/component/addressbook-config.c:977
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+msgid "Details"
+msgstr "خبرتياوې"
+
+#: ../addressbook/gui/component/addressbook-config.c:978
+#: ../mail/em-folder-browser.c:965
+msgid "Searching"
+msgstr "پلټل کيږي"
+
+#: ../addressbook/gui/component/addressbook-config.c:980
+msgid "Downloading"
+msgstr "لېښل کيږي"
+
+#: ../addressbook/gui/component/addressbook-config.c:1190
+#: ../addressbook/gui/component/ldap-config.glade.h:11
+msgid "Address Book Properties"
+msgstr "د پته کتاب ځانتياوې"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
+msgid "Migrating..."
+msgstr "...لېږدول کيږي"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../calendar/gui/migration.c:195
+#, c-format
+msgid "Migrating `%s':"
+msgstr ":لېږدول کيږي `%s'"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:645
+msgid "LDAP Servers"
+msgstr "پالنګرونه LDAP"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:760
+msgid "Autocompletion Settings"
+msgstr "د خپلبشپړېدنې امستنې"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
+msgid ""
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
+msgid ""
+"The format of mailing list contacts has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
+msgid ""
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
+msgid ""
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-view.c:430
+#: ../mail/em-folder-utils.c:503
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr ":پوښۍ بيانومول \"%s\" ته"
+
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:505
+msgid "Rename Folder"
+msgstr "پوښۍ بيانومول"
+
+#: ../addressbook/gui/component/addressbook-view.c:438
+#: ../mail/em-folder-utils.c:511
+msgid "Folder names cannot contain '/'"
+msgstr "نه شي لرلی. '/' د پوښېو نومونه"
+
+#: ../addressbook/gui/component/addressbook-view.c:950
+msgid "_New Address Book"
+msgstr "نوی پته کتاب_"
+
+#: ../addressbook/gui/component/addressbook-view.c:951
+msgid "Save As vCard..."
+msgstr "...ساتل ‎vCard لکه‎"
+
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/calendar-component.c:620
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../mail/em-folder-tree.c:2095 ../mail/em-folder-view.c:1347
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
+#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-tasks.xml.h:24
+msgid "_Delete"
+msgstr "ړنګول_"
+
+#: ../addressbook/gui/component/addressbook-view.c:957
+msgid "_Properties..."
+msgstr "...ځانتياوې_"
+
+#: ../addressbook/gui/component/addressbook-view.c:1345
+msgid "Contact Source Selector"
+msgstr "اړيلکلور سرچينه ټاکونکی"
+
+#: ../addressbook/gui/component/addressbook.c:99
+msgid "Accessing LDAP Server anonymously"
+msgstr "پالنګر ته بېنومه لاسرسی کول LDAP"
+
+#: ../addressbook/gui/component/addressbook.c:200
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
+msgid "Failed to authenticate.\n"
+msgstr ".په کره کولو کې پاتې راغی\n"
+
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook.c:215
+#: ../calendar/common/authentication.c:51
+#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../smime/gui/component.c:50
+msgid "Enter password"
+msgstr "تېرنويې وليکئ"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
+msgid "EFolderList XML for the list of completion URIs"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
+msgid "EFolderList XML for the list of completion URIs."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
+msgid ""
+"Position of the vertical pane, between the card and list views and the "
+"preview pane, in pixels."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show preview pane"
+msgstr "مخليد چوکاټ ښودل"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+msgid "URI for the folder last used in the select names dialog"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+msgid "URI for the folder last used in the select names dialog."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+msgid "Vertical pane position"
+msgstr "د نېغ چوکاټ ځای"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+msgid "Whether to show the preview pane."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:1
+msgid "1"
+msgstr "۱"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:2
+msgid "3268"
+msgstr "۳۲۶۸"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:3
+msgid "389"
+msgstr "۳۸۹"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:4
+msgid "5"
+msgstr "۵"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:5
+msgid "636"
+msgstr "۶۳۶‍"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:6
+msgid "<b>Authentication</b>"
+msgstr "<b>کرونه</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:7
+msgid "<b>Downloading</b>"
+msgstr "<b>لېښل کيږي</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:8
+msgid "<b>Searching</b>"
+msgstr "<b>پلټل کيږي</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:9
+msgid "<b>Type:</b>"
+msgstr "<b>:ډول</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:10
+msgid "Add Address Book"
+msgstr "پته کتاب زياتول"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../mail/em-account-editor.c:761
+msgid "Always"
+msgstr "تل"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:13
+msgid "Anonymously"
+msgstr "بېنومه"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:14
+msgid "Basic"
+msgstr "بنسټيز"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:16
+msgid "Distinguished name"
+msgstr "پېژندل شوی نوم"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+msgid "Email address"
+msgstr "برېښليک پته"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:18
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:19
+msgid "Find Possible Search Bases"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:21
+msgid "Lo_gin:"
+msgstr ":نن_وتل"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../mail/em-account-editor.c:760
+msgid "Never"
+msgstr "هېڅکله"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../mail/em-account-editor.c:288
+msgid "No encryption"
+msgstr "هېڅ کوډه کښنه"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+msgid "One"
+msgstr "يو"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:296
+msgid "SSL encryption"
+msgstr "کوډه کښنه SSL"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:26
+msgid "Search Filter"
+msgstr "پلټون چاڼ"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+msgid "Search _base:"
+msgstr ":پلټون _بنسټ"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:28
+msgid "Search _filter:"
+msgstr ":پلټون _چاڼ"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:29
+msgid "Search filter"
+msgstr "پلټون چاڼ"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:30
+msgid ""
+"Search filter is the type of the objects searched for, while performing the "
+"search. If this is not modified, by  default search will be performed on "
+"objectclass of the type \"person\"."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:32
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:33
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:34
+msgid "Sub"
+msgstr "څېرمه"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:35
+msgid "Supported Search Bases"
+msgstr ""
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../mail/em-account-editor.c:292
+msgid "TLS encryption"
+msgstr "کوډه کښنه TLS"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:37
+msgid ""
+"The search base is the distinguished name (DN) of the entry where your "
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+msgid ""
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:40
+msgid ""
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:41
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your ldap "
+"server."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:42
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list. It is for display purposes only. "
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:43
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:44
+msgid "Using distinguished name (DN)"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:45
+msgid "Using email address"
+msgstr "برېښليک کاروي"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:46
+msgid "Whenever Possible"
+msgstr "هر کله چې شونی وي"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:47
+msgid "_Add Address Book"
+msgstr "پته کتاب زياتول_"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:48
+msgid "_Download limit:"
+msgstr ":د رالېښنې بريد_"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:49
+msgid "_Find Possible Search Bases"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:50
+msgid "_Login method:"
+msgstr "د ننوتو لېله:_"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
+#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+msgid "_Name:"
+msgstr ":نوم_"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:52
+msgid "_Port:"
+msgstr ":درشل_"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+msgid "_Search scope:"
+msgstr ":پلټون سيمه_"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../mail/mail-config.glade.h:184
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+msgid "_Server:"
+msgstr ":پالنګر_"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:55
+msgid "_Timeout:"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+msgid "_Use secure connection:"
+msgstr ":خوندي نښلېدنه کارول_"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:57
+msgid "cards"
+msgstr "کارډونه"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../plugins/calendar-http/calendar-http.c:279
+#: ../plugins/calendar-weather/calendar-weather.c:561
+#: ../plugins/google-account-setup/google-source.c:401
+msgid "minutes"
+msgstr "مېنټه"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+msgid "<b>Email</b>"
+msgstr "<b>برېښليک</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+msgid "<b>Home</b>"
+msgstr "<b>کور</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid "<b>Instant Messaging</b>"
+msgstr "<b>ژر استوزونه</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+msgid "<b>Job</b>"
+msgstr "<b>دنده</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>ګډوډ</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Other</b>"
+msgstr "<b>نور</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "<b>Telephone</b>"
+msgstr "<b>ټېلېفون</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+msgid "<b>Web Addresses</b>"
+msgstr "<b>ګورت پتې</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+msgid "<b>Work</b>"
+msgstr "<b>دنده</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:614
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "...ټو_لۍ"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
+#: ../addressbook/gui/widgets/e-minicard.c:198
+msgid "Contact"
+msgstr "اړيکلوری"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
+msgid "Contact Editor"
+msgstr "اړيکلور سمونګر"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "Full _Name..."
+msgstr "...بشپړ _نوم"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+msgid "Image"
+msgstr "انځور"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+msgid "MSN Messenger"
+msgstr "استوزګر ‎MSN"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+msgid "Mailing Address"
+msgstr "استونې پته"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "Nic_kname:"
+msgstr ":ستا_ېنوم"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+msgid "Novell Groupwise"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+msgid "Personal Information"
+msgstr "وکړيزې خبرتياوې"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+msgid "Telephone"
+msgstr "ټېلېفون"
+
+#. red
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../mail/em-migrate.c:1057
+msgid "Work"
+msgstr "دنده"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "_Address:"
+msgstr ":پته_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+msgid "_Anniversary:"
+msgstr ":کليزه_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Assistant:"
+msgstr ":مرستيال_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+msgid "_Birthday:"
+msgstr ":زوکړه_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../calendar/gui/dialogs/event-page.c:788
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../plugins/itip-formatter/itip-view.c:1848
+msgid "_Calendar:"
+msgstr ":کليز_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "_City:"
+msgstr ":ښار_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+msgid "_Company:"
+msgstr ":کمپنۍ_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Country:"
+msgstr ":هېواد_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "_Department:"
+msgstr ":برخه_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_File under:"
+msgstr ":ليکل لاندې د_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+msgid "_Free/Busy:"
+msgstr ":وزګار/بوخت_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+msgid "_Home Page:"
+msgstr ":کور پاڼه_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+msgid "_Manager:"
+msgstr ":سمبالګر_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+msgid "_Notes:"
+msgstr ":يادښتونه_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+msgid "_Office:"
+msgstr ":افس_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "_PO Box:"
+msgstr ":پوسټ بکس_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "_Profession:"
+msgstr ":دنده_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+msgid "_Spouse:"
+msgstr ":کورودانې_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "_State/Province:"
+msgstr ":ولايت_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+msgid "_Title:"
+msgstr ":سرليک_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+msgid "_Video Chat:"
+msgstr ":وېديو بنډار_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+msgid "_Wants to receive HTML mail"
+msgstr "ليک ترلاسه کول غواړي HTML_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+msgid "_Web Log:"
+msgstr ":ګورت خبرال_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "_Where:"
+msgstr ":چېرته_"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+msgid "_Zip/Postal Code:"
+msgstr ":زېپ/پوسټي کوډ_"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
+msgid "Address"
+msgstr "پته"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
+#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../widgets/menus/gal-define-views-model.c:179
+#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
+msgid "Editable"
+msgstr "سمونوړ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+msgid "United States"
+msgstr "امرېکا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+msgid "Afghanistan"
+msgstr "افغانستان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+msgid "Albania"
+msgstr "البانيه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+msgid "Algeria"
+msgstr "الجيريا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+msgid "American Samoa"
+msgstr "امريکايي سموا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+msgid "Andorra"
+msgstr "انډورا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+msgid "Angola"
+msgstr "انګولا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+msgid "Anguilla"
+msgstr "انګوېلا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+msgid "Antarctica"
+msgstr "انټارکټېکا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+msgid "Antigua And Barbuda"
+msgstr "انټېګوا او باربوډا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+msgid "Argentina"
+msgstr "ارجېنټينا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+msgid "Armenia"
+msgstr "ارمينيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+msgid "Aruba"
+msgstr "اروبا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+msgid "Australia"
+msgstr "اسټريليا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+msgid "Austria"
+msgstr "اسټريا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+msgid "Azerbaijan"
+msgstr "ازربايجان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+msgid "Bahamas"
+msgstr "بهاماس"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+msgid "Bahrain"
+msgstr "بحرېن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+msgid "Bangladesh"
+msgstr "بنګلدېش"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+msgid "Barbados"
+msgstr "برباډوس"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+msgid "Belarus"
+msgstr "بېلاروس"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+msgid "Belgium"
+msgstr "بېلجيم"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+msgid "Belize"
+msgstr "بېلېز"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+msgid "Benin"
+msgstr "بېنېن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+msgid "Bermuda"
+msgstr "برموډا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+msgid "Bhutan"
+msgstr "بهوټان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+msgid "Bolivia"
+msgstr "بوليويا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+msgid "Bosnia And Herzegowina"
+msgstr "بوسنيا او هرزېګوينا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+msgid "Botswana"
+msgstr "بوټسوانا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+msgid "Bouvet Island"
+msgstr "بوېټ ټاپو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+msgid "Brazil"
+msgstr "برازيل"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+msgid "Brunei Darussalam"
+msgstr "بروني دارالسلام"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+msgid "Bulgaria"
+msgstr "بلګاريه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+msgid "Burkina Faso"
+msgstr "برکينا فاسو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+msgid "Burundi"
+msgstr "بورونډې"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+msgid "Cambodia"
+msgstr "کمبوډيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+msgid "Cameroon"
+msgstr "کېمېرون"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+msgid "Canada"
+msgstr "کاناډا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+msgid "Cape Verde"
+msgstr "کېپې ورډي"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+msgid "Cayman Islands"
+msgstr "کېمېن ټاپوګان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+msgid "Central African Republic"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+msgid "Chad"
+msgstr "چاډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+msgid "Chile"
+msgstr "چاېل"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+msgid "China"
+msgstr "چين"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+msgid "Christmas Island"
+msgstr "کرېسمېس ټاپو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+msgid "Colombia"
+msgstr "کولمبيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+msgid "Comoros"
+msgstr "کوموروس"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+msgid "Congo"
+msgstr "کونګو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+msgid "Congo, The Democratic Republic Of The"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+msgid "Cook Islands"
+msgstr "کوک ټاپو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+msgid "Costa Rica"
+msgstr "کوسټا رېکا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+msgid "Croatia"
+msgstr "کروټيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+msgid "Cuba"
+msgstr "کيوبا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+msgid "Cyprus"
+msgstr "سېپرس"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+msgid "Czech Republic"
+msgstr "د چېک ولسواکيز"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+msgid "Denmark"
+msgstr "ډېنمارک"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+msgid "Djibouti"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+msgid "Dominica"
+msgstr "ډومېنېکا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+msgid "Dominican Republic"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+msgid "Ecuador"
+msgstr "اېکوېډر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+msgid "Egypt"
+msgstr "مصر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+msgid "El Salvador"
+msgstr "ال سلوېډر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+msgid "Eritrea"
+msgstr "اېرېټريه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+msgid "Estonia"
+msgstr "اسټونيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+msgid "Ethiopia"
+msgstr "اېټوپيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+msgid "Falkland Islands"
+msgstr "فېلکلېنډ ټاپو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+msgid "Faroe Islands"
+msgstr "فېرو ټاپوګان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+msgid "Fiji"
+msgstr "فېجې"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+msgid "Finland"
+msgstr "فېنلېنډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+msgid "France"
+msgstr "فرانسه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+msgid "French Guiana"
+msgstr "فرېنچ ګويانا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+msgid "French Polynesia"
+msgstr "فرېنچ پولېنيشيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+msgid "Gabon"
+msgstr "ګابون"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+msgid "Gambia"
+msgstr "ګامبيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+msgid "Georgia"
+msgstr "ګورجيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+msgid "Germany"
+msgstr "جرمني"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+msgid "Ghana"
+msgstr "ګانا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+msgid "Gibraltar"
+msgstr "ګېبرالټر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+msgid "Greece"
+msgstr "يونان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+msgid "Greenland"
+msgstr "ګرينلېنډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+msgid "Grenada"
+msgstr "ګرېناډا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+msgid "Guadeloupe"
+msgstr "ګواډېلوپ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+msgid "Guam"
+msgstr "ګاوم"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+msgid "Guatemala"
+msgstr "ګواټيمالا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+msgid "Guernsey"
+msgstr "ګورنسي"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+msgid "Guinea"
+msgstr "ګوينيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guinea-Bissau"
+msgstr "ګوينيا-بېساو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+msgid "Guyana"
+msgstr "ګويانا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+msgid "Haiti"
+msgstr "هاېټاې"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+msgid "Heard And McDonald Islands"
+msgstr "هېرډ او مېکډونلډ ټاپوګان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+msgid "Holy See"
+msgstr "هالي سي"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+msgid "Honduras"
+msgstr "هونډوراس"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+msgid "Hong Kong"
+msgstr "هانګ کانګ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+msgid "Hungary"
+msgstr "هنګري"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+msgid "Iceland"
+msgstr "اېسلېنډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+msgid "India"
+msgstr "انډيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+msgid "Indonesia"
+msgstr "انډونيشيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+msgid "Iran"
+msgstr "ايران"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+msgid "Iraq"
+msgstr "عراق"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+msgid "Ireland"
+msgstr "اېرېلېنډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+msgid "Isle of Man"
+msgstr "اېسل اف مېن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+msgid "Israel"
+msgstr "اسرايل"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+msgid "Italy"
+msgstr "اټاليه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+msgid "Jamaica"
+msgstr "جماېکا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+msgid "Japan"
+msgstr "جاپان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+msgid "Jersey"
+msgstr "جرسي"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+msgid "Jordan"
+msgstr "جوردان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+msgid "Kazakhstan"
+msgstr "کزاکستان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+msgid "Kenya"
+msgstr "کينيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+msgid "Kiribati"
+msgstr "کېرېبتي"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+msgid "Korea, Democratic People's Republic Of"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+msgid "Korea, Republic Of"
+msgstr "کوريا، ولسواکيز د"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+msgid "Kuwait"
+msgstr "کوېټ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+msgid "Kyrgyzstan"
+msgstr "کرغزستان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+msgid "Laos"
+msgstr "لاوس"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+msgid "Latvia"
+msgstr "لېټويا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+msgid "Lebanon"
+msgstr "لبنان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+msgid "Lesotho"
+msgstr "لېسوټو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+msgid "Liberia"
+msgstr "لېبيريا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+msgid "Libya"
+msgstr "ليبيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+msgid "Liechtenstein"
+msgstr "لیکټنسټاېن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+msgid "Lithuania"
+msgstr "لېټوانا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+msgid "Luxembourg"
+msgstr "لکسېمبرګ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+msgid "Macao"
+msgstr "مکاو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+msgid "Macedonia"
+msgstr "مېسېډونيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+msgid "Madagascar"
+msgstr "مډګسکر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+msgid "Malawi"
+msgstr "ملاوي"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+msgid "Malaysia"
+msgstr "مليشيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+msgid "Maldives"
+msgstr "مالديوز"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+msgid "Mali"
+msgstr "مالي"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+msgid "Malta"
+msgstr "مالټا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+msgid "Marshall Islands"
+msgstr "مارشل ټاپوګان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+msgid "Martinique"
+msgstr "مارټينيک"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+msgid "Mauritania"
+msgstr "مورېټانيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+msgid "Mauritius"
+msgstr "مورېشيز"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+msgid "Mayotte"
+msgstr "ميوټي"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+msgid "Mexico"
+msgstr "مېکسيکا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+msgid "Micronesia"
+msgstr "ماېکرونيشيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+msgid "Moldova, Republic Of"
+msgstr "مولډوا، ولسواکيز د"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+msgid "Monaco"
+msgstr "موناکو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+msgid "Mongolia"
+msgstr "منګوليا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+msgid "Montserrat"
+msgstr "مونټسېرټ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+msgid "Morocco"
+msgstr "موروکو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+msgid "Mozambique"
+msgstr "موزامبېک"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+msgid "Myanmar"
+msgstr "ميانمار"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+msgid "Namibia"
+msgstr "نمېبيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+msgid "Nauru"
+msgstr "ناورو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+msgid "Nepal"
+msgstr "نيپال"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+msgid "Netherlands"
+msgstr "نيدرلېنډز"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+msgid "New Caledonia"
+msgstr "نوی کېلېډونيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+msgid "New Zealand"
+msgstr "نوی زيلېنډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+msgid "Nicaragua"
+msgstr "نېکراګوا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+msgid "Niger"
+msgstr "ناېجر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+msgid "Nigeria"
+msgstr "ناېجيريا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+msgid "Niue"
+msgstr "نيو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+msgid "Norfolk Island"
+msgstr "نارفولک ټاپو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+msgid "Northern Mariana Islands"
+msgstr "شمالي ماريانا ټاپوګان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+msgid "Norway"
+msgstr "ناروې"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+msgid "Oman"
+msgstr "عمان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+msgid "Pakistan"
+msgstr "پاکستان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+msgid "Palau"
+msgstr "پلاو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+msgid "Palestinian Territory"
+msgstr "فلستين"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+msgid "Panama"
+msgstr "پناما"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+msgid "Paraguay"
+msgstr "پراګ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+msgid "Peru"
+msgstr "پېرو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+msgid "Philippines"
+msgstr "فېلېپين"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+msgid "Pitcairn"
+msgstr "پېټکاېرن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+msgid "Poland"
+msgstr "پولېنډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+msgid "Portugal"
+msgstr "پرټګال"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+msgid "Puerto Rico"
+msgstr "پيورټو ريکو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+msgid "Qatar"
+msgstr "قطر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+msgid "Reunion"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+msgid "Romania"
+msgstr "رومانيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+msgid "Russian Federation"
+msgstr "رشين فېډېرېشن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+msgid "Rwanda"
+msgstr "روانډا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+msgid "Saint Kitts And Nevis"
+msgstr "سېنټ کېټس او نېوس"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+msgid "Saint Lucia"
+msgstr "سېنټ لوشيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+msgid "Saint Vincent And The Grenadines"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+msgid "Samoa"
+msgstr "سموا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+msgid "San Marino"
+msgstr "سېن مارينو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+msgid "Sao Tome And Principe"
+msgstr "ساو ټومي او پرېنسېپ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+msgid "Saudi Arabia"
+msgstr "سعودي عربيه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+msgid "Senegal"
+msgstr "سېنېګال"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+msgid "Serbia And Montenegro"
+msgstr "سربيا او مونټېنېګرو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+msgid "Seychelles"
+msgstr "سيچېلېس"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+msgid "Sierra Leone"
+msgstr "سيرا ليوني"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+msgid "Singapore"
+msgstr "سنګاپور"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+msgid "Slovakia"
+msgstr "سلواکيه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+msgid "Slovenia"
+msgstr "سلوينيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+msgid "Solomon Islands"
+msgstr "سولومون ټاپوګان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+msgid "Somalia"
+msgstr "سوماليا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+msgid "South Africa"
+msgstr "سهيلي افريکا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+msgid "South Georgia And The South Sandwich Islands"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+msgid "Spain"
+msgstr "سپېن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+msgid "Sri Lanka"
+msgstr "سري لانکا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+msgid "St. Helena"
+msgstr "سېنټ هېلېنا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+msgid "St. Pierre And Miquelon"
+msgstr "سېنټ پيري او مېکوېلان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+msgid "Sudan"
+msgstr "سوډان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+msgid "Suriname"
+msgstr "سورينام"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+msgid "Svalbard And Jan Mayen Islands"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+msgid "Swaziland"
+msgstr "سوازيلېنډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+msgid "Sweden"
+msgstr "سوېډېن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+msgid "Switzerland"
+msgstr "سوېټزرلېنډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+msgid "Syria"
+msgstr "سيريا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+msgid "Taiwan"
+msgstr "ټاېوان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+msgid "Tajikistan"
+msgstr "تاجکستان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+msgid "Tanzania, United Republic Of"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+msgid "Thailand"
+msgstr "تهاېلېنډ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+msgid "Timor-Leste"
+msgstr "ټېمور-لېسټي"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+msgid "Togo"
+msgstr "ټوګو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+msgid "Tokelau"
+msgstr "ټوکيلاو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+msgid "Tonga"
+msgstr "ټونګا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+msgid "Trinidad And Tobago"
+msgstr "ټرېنېډېډ او ټوبېګو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+msgid "Tunisia"
+msgstr "ټونيشيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+msgid "Turkey"
+msgstr "ترکيه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+msgid "Turkmenistan"
+msgstr "ترکمنستان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+msgid "Turks And Caicos Islands"
+msgstr "ټورکس او کاېکوس ټاپوګان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+msgid "Tuvalu"
+msgstr "ټېوالو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+msgid "Uganda"
+msgstr "وګېنډا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+msgid "Ukraine"
+msgstr "وکرېن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+msgid "United Arab Emirates"
+msgstr "د عربو متحده امارات"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+msgid "United Kingdom"
+msgstr "برتانيه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+msgid "Uruguay"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+msgid "Uzbekistan"
+msgstr "ازبکستان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+msgid "Vanuatu"
+msgstr "وېنواټو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+msgid "Venezuela"
+msgstr "وېنزوېلا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+msgid "Viet Nam"
+msgstr "وېټنام"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+msgid "Virgin Islands, British"
+msgstr "ورجېن ټاپوګان، برتانيه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+msgid "Virgin Islands, U.S."
+msgstr "ورجېن ټاپوګان، امريکا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+msgid "Wallis And Futuna Islands"
+msgstr "وېلېس او فوټونا ټاپوګان"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+msgid "Western Sahara"
+msgstr "لويديځه سهارا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+msgid "Yemen"
+msgstr "يمن"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+msgid "Zambia"
+msgstr "زامبيا"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+msgid "Zimbabwe"
+msgstr "زمبابوی"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../plugins/exchange-operations/exchange-delegates.c:952
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
+#: ../plugins/plugin-manager/plugin-manager.c:41
+#: ../plugins/save-attachments/save-attachments.c:350
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
+msgid "Name"
+msgstr "نوم"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+msgid "AOL Instant Messenger"
+msgstr "ژر استوزګر AOL"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:617
+msgid "Jabber"
+msgstr "جېبر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+msgid "Yahoo Messenger"
+msgstr "ياهو استوزګر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+msgid "Gadu-Gadu Messenger"
+msgstr "ګېډو-ګېډو استوزګر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:616
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
+msgid "Service"
+msgstr "پالنه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
+#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
+msgid "Location"
+msgstr "ځای"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+msgid "Username"
+msgstr "کارننوم"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
+#: ../addressbook/gui/widgets/eab-contact-display.c:58
+msgid "Home"
+msgstr "کور"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
+msgid "Other"
+msgstr "بل"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
+msgid "Yahoo"
+msgstr "ياهو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
+msgid "Gadu-Gadu"
+msgstr "ګاډو-ګاډو"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:618
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:615
+msgid "GroupWise"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
+msgid "Source Book"
+msgstr "سرچينه کتاب"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+msgid "Target Book"
+msgstr "موخه کتاب"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
+msgid "Is New Contact"
+msgstr "نوی اړيکلوری دی"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+msgid "Writable Fields"
+msgstr "ليکوړ ډګرونه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+msgid "Required Fields"
+msgstr "اړين ډګرونه"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
+msgid "Changed"
+msgstr "بدل شوی"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
+#, c-format
+msgid "Contact Editor - %s"
+msgstr "%s - اړيکلور سمونګر"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
+msgid "Please select an image for this contact"
+msgstr "د دې اړيکلوري لپاره يو انځور وټاکئ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+msgid "_No image"
+msgstr "هېڅ انځور_"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
+msgid ""
+"The contact data is invalid:\n"
+"\n"
+msgstr ""
+":د اړيکلوري اومتوک ناسم دی\n"
+"\n"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
+#, c-format
+msgid "%s'%s' is empty"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
+msgid "Invalid contact."
+msgstr ".ناسم اړيکلوری"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+msgid "Contact Quick-Add"
+msgstr "اړيکلوری ژر-زياتول"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+msgid "_Edit Full"
+msgstr "بشپړ سمول_"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+msgid "_Full name"
+msgstr "بشپړ نوم"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+msgid "E_mail"
+msgstr "ب_رېښليک"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
+msgid "_Select Address Book"
+msgstr "پته کتاب ټاکل_"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact list (%s)?"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
+msgid ""
+"Are you sure you want\n"
+"to delete these contact lists?"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact (%s)?"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr ":۲مه _پته"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Ci_ty:"
+msgstr ":ښ_ار"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr ":هېوا_د"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Full Address"
+msgstr "ټوله پته"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "_ZIP Code:"
+msgstr ":زېپ کوډ_"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+msgid "Dr."
+msgstr "ډاکټر"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+msgid "Esq."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Full Name"
+msgstr "بشپړ نوم"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+msgid "I"
+msgstr "۱"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+msgid "II"
+msgstr "۲"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr "۳"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+msgid "Miss"
+msgstr "اغلې"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr "ښاغلی"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr "ښاغلې"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr "اغلې"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+msgid "Sr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+msgid "_First:"
+msgstr ":لومړی_"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+msgid "_Last:"
+msgstr ":وروستی_"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+msgid "_Middle:"
+msgstr ":منځنی_"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+msgid "_Suffix:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+msgid "Add IM Account"
+msgstr "ګڼون زياتول IM"
+
+#: ../addressbook/gui/contact-editor/im.glade.h:2
+msgid "_Account name:"
+msgstr ":ګڼون نوم_"
+
+#: ../addressbook/gui/contact-editor/im.glade.h:3
+msgid "_IM Service:"
+msgstr ":پالنه IM_"
+
+#: ../addressbook/gui/contact-editor/im.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:409
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:234
+msgid "_Location:"
+msgstr ":ځای_"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "<b>Members</b>"
+msgstr "<b>غړي</b>"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
+msgid "Contact List Editor"
+msgstr "لړ سمونګر سره اړيکه نيول"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Select..."
+msgstr "...ټاکل"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_List name:"
+msgstr ":د لړ نوم_"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+msgid "_Type an email address or drag a contact into the list below:"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+msgid "Contact List Members"
+msgstr "د اړيکلور لړ غړي"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+msgid "_Members"
+msgstr "غړي_"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:298
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
+msgid "Book"
+msgstr "کتاب"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
+msgid "Is New List"
+msgstr "نوی لړ دی"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr ":بدل شوی اړيکلوری"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+msgid "Duplicate Contact Detected"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The name or email of this contact already exists in this folder.  Would you "
+"like to add it anyway?"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+msgid "New Contact:"
+msgstr ":نوی اړيکلوری"
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+msgid "Original Contact:"
+msgstr ":ار اړيکلوری"
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "اړيکلوری سره ننويستل"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:200
+msgid "_Merge"
+msgstr "سره ننويستل_"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:253
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
+msgid "Email"
+msgstr "برېښليک"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
+msgid "Any field contains"
+msgstr "هر ډګر لري"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+msgid "Email begins with"
+msgstr "برېښليک پېلېږي په"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+msgid "Name contains"
+msgstr "نوم لري"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+msgid "No contacts"
+msgstr "هېڅ اړيکلوري"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "اړيکلوری %d"
+msgstr[1] "اړيکلوري %d"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
+msgid "Query"
+msgstr "پوښتن"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+msgid "Error getting book view"
+msgstr "د کتاب کوت په اخيستلو کې تېروتنه"
+
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
+#: ../widgets/table/e-table-click-to-add.c:510
+#: ../widgets/table/e-table-selection-model.c:303
+#: ../widgets/table/e-table.c:3353
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
+msgid "Model"
+msgstr "بېلګه"
+
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+msgid "Error modifying card"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+msgid "Name begins with"
+msgstr "نوم پېليږي په"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+msgid "Source"
+msgstr "سرچينه"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-meeting-list-view.c:508
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:5
+msgid "Type"
+msgstr "ډول"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
+msgid "Save as vCard..."
+msgstr "...ساتل vCard لکه"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1566
+#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
+#: ../ui/evolution-addressbook.xml.h:56
+msgid "_Open"
+msgstr "پرانيستل_"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+msgid "_New Contact..."
+msgstr "...نوی اړيکلوری_"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+msgid "New Contact _List..."
+msgstr "...نوی اړيکلور _لړ"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+msgid "_Save as vCard..."
+msgstr "...ساتل vCard لکه_"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+msgid "_Forward Contact"
+msgstr "اړيکلوری مخکې کول_"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+msgid "_Forward Contacts"
+msgstr "اړيکلوري مخکې کول_"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+msgid "Send _Message to Contact"
+msgstr "اړيکلوري ته _استوزه لېږل"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+msgid "Send _Message to List"
+msgstr "لړ ته _استوزه لېږل"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+msgid "Send _Message to Contacts"
+msgstr "اړيکلوريو ته _استوزه لېږل"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+msgid "_Print"
+msgstr "چاپول_"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+msgid "Cop_y to Address Book..."
+msgstr "...پته کتاب ته لمېس_ل"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+msgid "Mo_ve to Address Book..."
+msgstr "...پته کتاب ته خوځ_ول"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+msgid "Cu_t"
+msgstr "سکڼ_ل"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1574
+#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:996
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
+msgid "_Copy"
+msgstr "لمېسل_"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+msgid "P_aste"
+msgstr "س_رېښل"
+
+#. All, unmatched, separator
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
+#: ../calendar/gui/cal-search-bar.c:680
+msgid "Any Category"
+msgstr "هره ټولۍ"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "بله تېروتنه"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:634
+msgid "Assistant"
+msgstr "مرستيال"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "مرستيال ټېلېفون"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "د سوداګرۍ فېکس"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "د سوداګرۍ ټېلېفون"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "د سوداګرۍ ۲ ټېلېفون"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "د ګادي ټېلېفون"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
+#: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:1
+msgid "Categories"
+msgstr "ټولۍ"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+msgid "Company"
+msgstr "کمپنۍ"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "د کمپنۍ ټېلېفون"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 2"
+msgstr "۲م برېښليک"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Email 3"
+msgstr "۳م برېښليک"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "Family Name"
+msgstr "د کورنۍ نوم"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+msgid "File As"
+msgstr "ليکل لکه"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Given Name"
+msgstr "ورکړل شوی نوم"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Fax"
+msgstr "د کور فېکس"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone"
+msgstr "د کور ټېلېفون"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone 2"
+msgstr "د کور ۲ ټېلېفون"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "ISDN Phone"
+msgstr "ټېلېفون ISDN"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Journal"
+msgstr "ورځپاڼه"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+msgid "Manager"
+msgstr "سمبالګر"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
+msgid "Mobile Phone"
+msgstr "ګرځنده ټېلېفون"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Nickname"
+msgstr "ستاېنوم"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:667
+msgid "Note"
+msgstr "يادښت"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "افس"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "بل فېکس"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "بل ټېلېفون"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "مخوونی"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "لومړنی ټېلېفون"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "رېډيو"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: ../calendar/gui/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:713
+msgid "Role"
+msgstr "رول"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
+msgid "Spouse"
+msgstr "کورودانه"
+
+#. Translators: This is a vcard standard and stands for the type of
+#. phone used by the hearing impaired. TTY stands for "teletype"
+#. (familiar from Unix device names), and TDD is "Telecommunications
+#. Device for Deaf". However, you probably want to leave this
+#. abbreviation unchanged unless you know that there is actually a
+#. different and established translation for this in your language.
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+msgid "Telex"
+msgstr "ټېلېکس"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+msgid "Title"
+msgstr "سرليک"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Unit"
+msgstr "يوون"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Web Site"
+msgstr "ګورت پاڼه"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
+#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../widgets/table/e-table-click-to-add.c:524
+#: ../widgets/table/e-table-col.c:99
+#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
+#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+msgid "Width"
+msgstr "پلنوالی"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
+#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../widgets/table/e-table-click-to-add.c:531
+#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+msgid "Height"
+msgstr "اوږدوالی"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:169
+msgid "Has Focus"
+msgstr "منځواله لري"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "ډګر"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "د ډګر نوم"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "د ليکنې بېلګه"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
+msgid "Column Width"
+msgstr "د ستن پلنوالی"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+".د اړيکلوري لپاره پلټل"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
+msgid ""
+"\n"
+"\n"
+"Search for the Contact\n"
+"\n"
+"or double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"د اړيکلوری ولټوﺉ\n"
+"\n"
+".یا دلته دوه ځله کېکاږﺉ چې نوی ګڼون جوړ کړﺉ"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+".په دې کوت کې د ښودلو لپاره کوم توکي نشته\n"
+".دلته دوه ځله کېکاږﺉ چې نوی ګڼون جوړ کړﺉ"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
+msgid ""
+"\n"
+"\n"
+"Search for the Contact."
+msgstr ""
+"\n"
+"\n"
+".د اړيکلوري لپاره پلټل"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+".په دې ليد کې د ښودلو لپاره کوم توکي نشته"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
+msgid "Adapter"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard.c:99
+msgid "Work Email"
+msgstr "د دندې برېښليک"
+
+#: ../addressbook/gui/widgets/e-minicard.c:100
+msgid "Home Email"
+msgstr "د کور برېښليک"
+
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
+msgid "Other Email"
+msgstr "بل برېښليک"
+
+#: ../addressbook/gui/widgets/e-minicard.c:177
+msgid "Selected"
+msgstr "ټاکل شوی"
+
+#: ../addressbook/gui/widgets/e-minicard.c:184
+msgid "Has Cursor"
+msgstr "ځری لري"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
+msgid "_Open Link in Browser"
+msgstr "تړنه په لټووني کې پرانيستل_"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:173
+#: ../mail/em-folder-view.c:2810
+msgid "_Copy Link Location"
+msgstr "د تړنې ځای لمېسل_"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
+msgid "_Send New Message To..."
+msgstr "...ته نوې استوزه لېږل_"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "برېښليک _پته لمېسل"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+#: ../addressbook/gui/widgets/eab-contact-display.c:372
+msgid "(map)"
+msgstr "(نخچه)"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:306
+#: ../addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/eab-contact-display.c:402
+msgid "map"
+msgstr "نخچه"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:487
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
+msgid "List Members"
+msgstr "غړي لړول"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+msgid "Department"
+msgstr "برخه"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
+msgid "Profession"
+msgstr "دنده"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+msgid "Position"
+msgstr "ځای"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
+msgid "Video Chat"
+msgstr "وېډيو بنډار"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/gnome-cal.c:2376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:574
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
+#: ../plugins/hula-account-setup/camel-hula-listener.c:378
+#: ../plugins/hula-account-setup/camel-hula-listener.c:407
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "کليز"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:637
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/event-editor.c:114
+msgid "Free/Busy"
+msgstr "وزګار/بوخت"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
+msgid "Phone"
+msgstr "ټېلېفون"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:639
+msgid "Fax"
+msgstr "فېکس"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+msgid "Home Page"
+msgstr "کور پاڼه"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
+msgid "Web Log"
+msgstr "ګورت خبرال"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
+msgid "Birthday"
+msgstr "کليزه"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
+msgid "Anniversary"
+msgstr "کليزه"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
+msgid "Job Title"
+msgstr "د دندې سرليک"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
+msgid "Home page"
+msgstr "کور پاڼه"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
+msgid "Blog"
+msgstr "بلاګ"
+
+#. E_BOOK_ERROR_OK
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Success"
+msgstr "بری"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Repository offline"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Address Book does not exist"
+msgstr "پته کتاب شتون نه لري"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
+msgid "No Self Contact defined"
+msgstr ""
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+msgid "Permission denied"
+msgstr "پرېښله ونه منل شوه"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+msgid "Contact not found"
+msgstr "اړيکلوری ونه موندل شو"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
+msgid "Contact ID already exists"
+msgstr "اړيکلوری پېژند د مخکې نه شتون لري"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Protocol not supported"
+msgstr "باندره نه منل کيږي"
+
+#. E_BOOK_ERROR_CANCELLED
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:635 ../calendar/gui/print.c:2523
+msgid "Canceled"
+msgstr "بند شو"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
+msgid "Could not cancel"
+msgstr "نه شي بندولی"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../calendar/gui/comp-editor-factory.c:423
+msgid "Authentication Failed"
+msgstr "کرونه پاتې راغله"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+msgid "Authentication Required"
+msgstr "کرونه اړينه ده"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+msgid "TLS not Available"
+msgstr "نه شته ‎TLS"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
+msgid "No such source"
+msgstr "داسې سرچينه نشته"
+
+#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
+msgid "Not available in offline mode"
+msgstr "په ناليکه اکر کې شتون نه لري"
+
+#. E_BOOK_ERROR_INVALID_SERVER_VERSION
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
+msgid "Invalid server version"
+msgstr "د پالنګر ناسمه نسخه"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:101
+msgid ""
+"We were unable to open this addressbook. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the addressbook once in online mode to download its contents"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#, c-format
+msgid ""
+"We were unable to open this addressbook.  Please check that the path %s "
+"exists and that you have permission to access it."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:131
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:169
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+msgid "This query did not complete successfully."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
+msgid "Error adding list"
+msgstr "د لړ په زياتولو کې ستونزه"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:670
+msgid "Error adding contact"
+msgstr "د اړيکلوري په زياتولو کې ستونزه"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
+msgid "Error modifying list"
+msgstr "د اړ په سمولو کې ستونزه"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
+msgid "Error modifying contact"
+msgstr "د اړيکلوري په سمولو کې ستونزه"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
+msgid "Error removing list"
+msgstr "د لړ په ړنګولو کې ستونزه"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:620
+msgid "Error removing contact"
+msgstr "د اړيکلوري په ړنګولو کې ستونزه"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#, c-format
+msgid ""
+"Opening %d contact will open %d new window as well.\n"
+"Do you really want to display this contact?"
+msgid_plural ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:307
+msgid "_Don't Display"
+msgstr "نه ښودل_"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
+msgid "Display _All Contacts"
+msgstr "ټول _اړيکلوري ښودل"
+
+#. For Translators only: "it" refers to the filename %s.
+#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:338
+msgid "Overwrite"
+msgstr "ځاېناستول"
+
+#. more than one, finding the total number of contacts might
+#. * hit performance while saving large number of contacts
+#.
+#: ../addressbook/gui/widgets/eab-gui-util.c:379
+#: ../addressbook/gui/widgets/eab-gui-util.c:382
+msgid "contact"
+msgid_plural "contacts"
+msgstr[0] "اړيکلور"
+msgstr[1] "اړيکلوري"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:428
+msgid "card.vcf"
+msgstr "کارډ.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:465
+msgid "Select Address Book"
+msgstr "پته کتاب ټاکل"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:579
+msgid "list"
+msgstr "لړ"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:731
+msgid "Move contact to"
+msgstr "ته اړيکلوری خوځول"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:733
+msgid "Copy contact to"
+msgstr "ته اړيکلوری لمېسل"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:736
+msgid "Move contacts to"
+msgstr "ته اړيکلوري خوځول"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
+msgid "Copy contacts to"
+msgstr "ته اړيکلوري لمېسل"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:883
+msgid "Multiple vCards"
+msgstr "vCards ګڼ"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#, c-format
+msgid "vCard for %s"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#, c-format
+msgid "Contact information"
+msgstr "د اړيکلوري خبرتياوې"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#, c-format
+msgid "Contact information for %s"
+msgstr "اړيکلوري خبرتياوې %s ‎د"
+
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
+msgid "Querying Address Book..."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#, c-format
+msgid "There is one other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:228
+#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+msgid "Show Full vCard"
+msgstr "ښودل vCard بشپړ"
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+msgid "Show Compact vCard"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+msgid "Save in addressbook"
+msgstr "په پته کتاب کې ساتل"
+
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+msgid "Card View"
+msgstr "کارډ ليد"
+
+#: ../addressbook/importers/evolution-csv-importer.c:658
+#: ../addressbook/importers/evolution-ldif-importer.c:498
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
+msgid "Importing..."
+msgstr "...دننول کيږي"
+
+#: ../addressbook/importers/evolution-csv-importer.c:860
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:861
+msgid "Outlook CSV and Tab Importer"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:869
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:870
+msgid "Mozilla CSV and Tab Importer"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:878
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:879
+msgid "Evolution CSV and Tab Importer"
+msgstr ""
+
+#: ../addressbook/importers/evolution-ldif-importer.c:665
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: ../addressbook/importers/evolution-ldif-importer.c:666
+msgid "Evolution LDIF importer"
+msgstr ""
+
+#: ../addressbook/importers/evolution-vcard-importer.c:547
+msgid "vCard (.vcf, .gcrd)"
+msgstr ""
+
+#: ../addressbook/importers/evolution-vcard-importer.c:548
+msgid "Evolution vCard Importer"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:1
+msgid "10 pt. Tahoma"
+msgstr "‍۱۰ ټکي. تاهوما"
+
+#: ../addressbook/printing/e-contact-print.glade.h:2
+msgid "8 pt. Tahoma"
+msgstr "۸ ټکي. تاهوما"
+
+#: ../addressbook/printing/e-contact-print.glade.h:3
+msgid "Blank forms at end:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:4
+msgid "Body"
+msgstr "تنه"
+
+#: ../addressbook/printing/e-contact-print.glade.h:5
+msgid "Bottom:"
+msgstr ":لاندې"
+
+#: ../addressbook/printing/e-contact-print.glade.h:6
+msgid "Dimensions:"
+msgstr ":ډډې"
+
+#: ../addressbook/printing/e-contact-print.glade.h:7
+msgid "F_ont..."
+msgstr "...ل_يکبڼه"
+
+#: ../addressbook/printing/e-contact-print.glade.h:8
+msgid "Fonts"
+msgstr "ليکبڼې"
+
+#: ../addressbook/printing/e-contact-print.glade.h:9
+msgid "Footer:"
+msgstr ":پښۍ"
+
+#: ../addressbook/printing/e-contact-print.glade.h:10
+msgid "Format"
+msgstr "بڼه"
+
+#: ../addressbook/printing/e-contact-print.glade.h:11
+#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
+#: ../widgets/table/e-table-field-chooser-dialog.c:81
+#: ../widgets/table/e-table-field-chooser-item.c:648
+#: ../widgets/table/e-table-field-chooser.c:81
+#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-selection-model.c:310
+msgid "Header"
+msgstr "سرۍ"
+
+#: ../addressbook/printing/e-contact-print.glade.h:12
+msgid "Header/Footer"
+msgstr "سرۍ/پښۍ"
+
+#: ../addressbook/printing/e-contact-print.glade.h:13
+msgid "Headings"
+msgstr "سريزونه"
+
+#: ../addressbook/printing/e-contact-print.glade.h:14
+msgid "Headings for each letter"
+msgstr "د هر ليک لپاره سريزونه"
+
+#: ../addressbook/printing/e-contact-print.glade.h:15
+msgid "Height:"
+msgstr ":اوږدوالی"
+
+#: ../addressbook/printing/e-contact-print.glade.h:16
+msgid "Immediately follow each other"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:17
+msgid "Include:"
+msgstr ":‍‍ننويستل"
+
+#: ../addressbook/printing/e-contact-print.glade.h:18
+msgid "Landscape"
+msgstr "پسوریز"
+
+#: ../addressbook/printing/e-contact-print.glade.h:19
+msgid "Left:"
+msgstr ":کيڼ"
+
+#: ../addressbook/printing/e-contact-print.glade.h:20
+msgid "Letter tabs on side"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:21
+msgid "Margins"
+msgstr "مورګې"
+
+#: ../addressbook/printing/e-contact-print.glade.h:22
+msgid "Number of columns:"
+msgstr ":د ستنو شمېر"
+
+#: ../addressbook/printing/e-contact-print.glade.h:23
+msgid "Options"
+msgstr "غوراوي"
+
+#: ../addressbook/printing/e-contact-print.glade.h:24
+msgid "Orientation"
+msgstr "لورموندنه"
+
+#: ../addressbook/printing/e-contact-print.glade.h:25
+msgid "Page"
+msgstr "مخ"
+
+#: ../addressbook/printing/e-contact-print.glade.h:26
+msgid "Page Setup:"
+msgstr ":مخ امسته"
+
+#: ../addressbook/printing/e-contact-print.glade.h:27
+msgid "Paper"
+msgstr ":پاڼه"
+
+#: ../addressbook/printing/e-contact-print.glade.h:28
+msgid "Paper source:"
+msgstr ":د پاڼو سرچينه"
+
+#: ../addressbook/printing/e-contact-print.glade.h:29
+msgid "Portrait"
+msgstr "تيک"
+
+#: ../addressbook/printing/e-contact-print.glade.h:30
+msgid "Preview:"
+msgstr ":مخليد"
+
+#: ../addressbook/printing/e-contact-print.glade.h:31
+msgid "Print using gray shading"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:32
+msgid "Reverse on even pages"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:33
+msgid "Right:"
+msgstr ":ښي"
+
+#: ../addressbook/printing/e-contact-print.glade.h:34
+msgid "Sections:"
+msgstr ":برخې"
+
+#: ../addressbook/printing/e-contact-print.glade.h:35
+msgid "Shading"
+msgstr ""
+
+#. FIXME: Take care of i18n
+#: ../addressbook/printing/e-contact-print.glade.h:36
+#: ../plugins/exchange-operations/exchange-account-setup.c:1055
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:217
+msgid "Size:"
+msgstr ":کچ"
+
+#: ../addressbook/printing/e-contact-print.glade.h:37
+msgid "Start on a new page"
+msgstr "په نوي مخ پېلول"
+
+#: ../addressbook/printing/e-contact-print.glade.h:38
+msgid "Style name:"
+msgstr ":ډول نوم"
+
+#: ../addressbook/printing/e-contact-print.glade.h:39
+msgid "Top:"
+msgstr ":بره"
+
+#: ../addressbook/printing/e-contact-print.glade.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr ":ډول"
+
+#: ../addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
+msgstr ":پلنوالی"
+
+#: ../addressbook/printing/e-contact-print.glade.h:42
+msgid "_Font..."
+msgstr "...ليکبڼه_"
+
+#: ../addressbook/printing/test-contact-print-style-editor.c:53
+msgid "Contact Print Style Editor Test"
+msgstr ""
+
+#: ../addressbook/printing/test-contact-print-style-editor.c:54
+#: ../addressbook/printing/test-print.c:44
+msgid "Copyright (C) 2000, Ximian, Inc."
+msgstr ""
+
+#: ../addressbook/printing/test-contact-print-style-editor.c:56
+msgid "This should test the contact print style editor widget"
+msgstr ""
+
+#: ../addressbook/printing/test-print.c:43
+msgid "Contact Print Test"
+msgstr ""
+
+#: ../addressbook/printing/test-print.c:46
+msgid "This should test the contact print code"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+msgid "Can not open file"
+msgstr "دوتنه نه شي پرانيستلی"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+msgid "Couldn't get list of addressbooks"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+msgid "failed to open book"
+msgstr "د کتاب په پرانيستلو کې پاتې راغی"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:49
+msgid "Specify the output file instead of standard output"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:50
+msgid "OUTPUTFILE"
+msgstr "وتېدوتنه"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:53
+msgid "List local addressbook folders"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:56
+msgid "Show cards as vcard or csv file"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:57
+msgid "[vcard|csv]"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:60
+msgid "Export in asynchronous mode"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:65
+msgid "NUMBER"
+msgstr "شمېره"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:102
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:116
+msgid "Only support csv or vcard format."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:125
+msgid "In async mode, output must be file."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:133
+msgid "In normal mode, there is no need for the size option."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:164
+msgid "Unhandled error"
+msgstr ""
+
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:2
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr ""
+
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:4
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:5
+msgid ""
+"Adding a meaningful summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:6
+msgid ""
+"Adding a meaningful summary to your task will give your recipients an idea "
+"of what your task is about."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:7
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:8
+msgid "All information in this memo will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:9
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:10
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:11
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:12
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:13
+msgid "All information on this memo will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:14
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:15
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:16
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:18
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:19
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:20
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:21
+msgid "Are you sure you want to delete this appointment?"
+msgstr "تاسو په ډاډه توګه دا ټاکنه ړنګول غواړﺉ؟"
+
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:179
+#, c-format
+msgid "Are you sure you want to delete this meeting?"
+msgstr "تاسو په ډاډه توګه دا کتنه ړنګول غواړﺉ؟"
+
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:185
+#, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "تاسو په ډاډه توګه دا ميمو ړنګول غواړﺉ؟"
+
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:182
+#, c-format
+msgid "Are you sure you want to delete this task?"
+msgstr "تاسو په ډاډه توګه دا دنده ړنګول غواړﺉ؟"
+
+#: ../calendar/calendar.error.xml.h:25
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:26
+msgid "Are you sure you want to send the appointment without a summary?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:27
+msgid "Are you sure you want to send the task without a summary?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:28
+msgid "Cannot create a new event"
+msgstr "نوې پېښه نه شي جوړولی"
+
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "پېښه نه شي ساتلی"
+
+#: ../calendar/calendar.error.xml.h:30
+msgid "Delete calendar '{0}'?"
+msgstr "کليز ړنګول غواړﺉ؟ ‎'{0}'"
+
+#: ../calendar/calendar.error.xml.h:31
+msgid "Delete memo list '{0}'?"
+msgstr "ميمو لړ ړنګول غواړﺉ؟ ‎'{0}'"
+
+#: ../calendar/calendar.error.xml.h:32
+msgid "Delete task list '{0}'?"
+msgstr "دنده لړ ړنګول غواړﺉ؟ ‎'{0}'"
+
+#: ../calendar/calendar.error.xml.h:33
+msgid "Do _not Send"
+msgstr "نه_ لېږل"
+
+#: ../calendar/calendar.error.xml.h:34
+msgid "Download in progress. Do you want to save the appointment?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:35
+msgid "Download in progress. Do you want to save the task?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:36
+msgid "Editor could not be loaded."
+msgstr ".سمونګر نه شي لېښل کېدی"
+
+#: ../calendar/calendar.error.xml.h:37
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:38
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:39
+msgid "Error loading calendar"
+msgstr "د کليز په لېښلو کې ستونزه"
+
+#: ../calendar/calendar.error.xml.h:40
+msgid "Error loading memo list"
+msgstr "د ميمو لړ په لېښلو کې ستونزه"
+
+#: ../calendar/calendar.error.xml.h:41
+msgid "Error loading task list"
+msgstr "د دنده لړ په لېښلو کې ستونزه"
+
+#: ../calendar/calendar.error.xml.h:42
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:43
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:44
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:45
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:46
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:47
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:48
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:49
+msgid "Some features may not work properly with your current server."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:50
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr ".د اېوليوشن کليز په ناسمه توګه بند کړل شو"
+
+#: ../calendar/calendar.error.xml.h:51
+msgid "The Evolution memo has quit unexpectedly."
+msgstr ".د اېوليوشن ميمو په ناسمه توګه بنده کړل شوه"
+
+#: ../calendar/calendar.error.xml.h:52
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ".د اېوليوشن دندې په ناسمه توګه بندې کړل شوې"
+
+#: ../calendar/calendar.error.xml.h:53
+msgid "The calendar is not marked for offline usage."
+msgstr ".کليز د ناليکه کارونې لپاره نه دی نښول شوی"
+
+#: ../calendar/calendar.error.xml.h:54
+#, fuzzy
+msgid "The memo list is not marked for offline usage."
+msgstr ".د ميموګانو لړ د ناليکه کارونې لپاره نه دی نښول شوی"
+
+#: ../calendar/calendar.error.xml.h:55
+msgid "The task list is not marked for offline usage."
+msgstr ".د دندو لړ د ناليکه کارونې لپاره نه دی نښول شوی"
+
+#: ../calendar/calendar.error.xml.h:56
+msgid "This calendar will be removed permanently."
+msgstr ".دا کليز به د تل لپاره وړنګول شي"
+
+#: ../calendar/calendar.error.xml.h:57
+msgid "This memo list will be removed permanently."
+msgstr ".دا ميمو به د تل لپاره وړنګول شي"
+
+#: ../calendar/calendar.error.xml.h:58
+msgid "This task list will be removed permanently."
+msgstr ".دا دنده لړ به د تل لپاره وړنګول شي"
+
+#: ../calendar/calendar.error.xml.h:59
+msgid "Would you like to save your changes to this appointment?"
+msgstr "دې ټاکنه کې خپلې بدلونې ساتل غواړﺉ؟"
+
+#: ../calendar/calendar.error.xml.h:60
+msgid "Would you like to save your changes to this memo?"
+msgstr "دې ميمو کې خپلې بدلونې ساتل غواړﺉ؟"
+
+#: ../calendar/calendar.error.xml.h:61
+msgid "Would you like to save your changes to this task?"
+msgstr "دې دنده کې خپلې بدلونې ساتل غواړﺉ؟"
+
+#: ../calendar/calendar.error.xml.h:62
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:63
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:64
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:65
+msgid "Would you like to send this task to participants?"
+msgstr "تاسو غواړﺉ چې دا دنده ونډوالو ته ولېږﺉ؟"
+
+#: ../calendar/calendar.error.xml.h:66
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:67
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:68
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:69
+msgid "You have changed this appointment, but not yet saved it."
+msgstr ".تاسو دې ټاکنه کې بدلونونه کړي، خو تر اوسه مو نه دي ساتلي"
+
+#: ../calendar/calendar.error.xml.h:70
+msgid "You have changed this task, but not yet saved it."
+msgstr ".تاسو دې دنده کې بدلونونه کړي، خو تر اوسه مو نه دي ساتلي"
+
+#: ../calendar/calendar.error.xml.h:71
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr ".تاسو دې ميمو کې بدلونونه کړي، خو تر اوسه مو نه دي ساتلي"
+
+#: ../calendar/calendar.error.xml.h:72
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:73
+msgid "Your memos will not be available until Evolution is restarted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:74
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Discard Changes"
+msgstr "بدلونونه پرېښودل_"
+
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
+msgid "_Save"
+msgstr "ساتل_"
+
+#: ../calendar/calendar.error.xml.h:77
+msgid "_Save Changes"
+msgstr "بدلونونه ساتل_"
+
+#: ../calendar/calendar.error.xml.h:78
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
+msgid "_Send"
+msgstr "لېږل_"
+
+#: ../calendar/calendar.error.xml.h:79
+msgid "_Send Notice"
+msgstr "يادښت لېږل_"
+
+#: ../calendar/calendar.error.xml.h:80
+msgid "{0}."
+msgstr ".{0}"
+
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/calendar/calendar-conduit.c:1522
+#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/todo/todo-conduit.c:1019
+msgid "Could not start evolution-data-server"
+msgstr "اېوليوشن-اومتوک-پالنګر نه شي پېلولی"
+
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
+msgid "Could not read pilot's Calendar application block"
+msgstr ""
+
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
+msgid "Could not read pilot's Memo application block"
+msgstr ""
+
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
+msgid "Could not write pilot's Memo application block"
+msgstr ""
+
+#: ../calendar/conduits/todo/todo-conduit.c:240
+msgid "Default Priority:"
+msgstr ""
+
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
+msgid "Could not read pilot's ToDo application block"
+msgstr ""
+
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
+msgid "Could not write pilot's ToDo application block"
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../plugins/itip-formatter/itip-formatter.c:2359
+msgid "Calendar and Tasks"
+msgstr "کليز او دندې"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: ../calendar/gui/calendar-component.c:1403
+msgid "Calendars"
+msgstr "کليزونه"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "خپله مهالسيمه، کليز او دنده لړ دلته وسازوﺉ"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "اېوليوشن کليز او دندې"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "د اېوليوشن کليز سازونې مهار"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar/Task editor"
+msgstr "اېوليوشن کليز/دنده سمونګر"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution's Calendar component"
+msgstr "د اېوليوشن کليز رغتوکی"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution's Memos component"
+msgstr "د اېوليوشن ميمو رغتوکی"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Tasks component"
+msgstr "د اېوليوشن دندو رغتوکی"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Memo_s"
+msgstr "ميموګان_ې"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
+#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/memos-control.c:369
+msgid "Memos"
+msgstr "ميموګانې"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#: ../calendar/gui/e-calendar-table.c:696 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
+#: ../calendar/gui/tasks-component.c:540
+#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/importers/icalendar-importer.c:74
+#: ../calendar/importers/icalendar-importer.c:735
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
+msgid "Tasks"
+msgstr "دندې"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+msgid "_Calendars"
+msgstr "کليزونه_"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "دندې_"
+
+#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "مېنټ"
+msgstr[1] "مېنټه"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/calendar-http/calendar-http.c:280
+#: ../plugins/calendar-weather/calendar-weather.c:562
+#: ../plugins/google-account-setup/google-source.c:402
+msgid "hours"
+msgid_plural "hours"
+msgstr[0] "ګېنټې"
+msgstr[1] "ګېنټې"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+msgid "Start time"
+msgstr "پېل مهال"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
+msgid "Appointments"
+msgstr "ټاکنې"
+
+#. Location
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/e-itip-control.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1002
+msgid "Location:"
+msgstr ":ځای"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze _time:"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:41
+#: ../widgets/menus/gal-define-views.glade.h:5
+msgid "_Edit"
+msgstr "سمون_"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+msgid "_Snooze"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+msgid "location of appointment"
+msgstr "د ټاکنی ځای"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
+msgid "No summary available."
+msgstr ".لنډيز نه شته"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
+msgid "No description available."
+msgstr ".سپړاوی نشته"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+msgid "No location information available."
+msgstr ".د ځای خبرتياوې نشته"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
+#, c-format
+msgid "You have %d alarms"
+msgstr "خبرونې لرﺉ ‎%d ‎‎تاسو"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1677
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1705
+#: ../mail/mail-component.c:1585
+msgid "Warning"
+msgstr "خبرتيا"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1681
+msgid ""
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email.  Evolution will display\n"
+"a normal reminder dialog box instead."
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#, c-format
+msgid ""
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
+msgid "Do not ask me about this program again."
+msgstr ".د دې کړنلار په اړه بيا نه پوښتل"
+
+#: ../calendar/gui/alarm-notify/notify-main.c:138
+msgid "Could not initialize Bonobo"
+msgstr "بونوبو نه شي پېلولی"
+
+#: ../calendar/gui/alarm-notify/notify-main.c:151
+msgid ""
+"Could not create the alarm notify service factory, maybe it's already "
+"running..."
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/util.c:41
+msgid "invalid time"
+msgstr "ناسم مهال"
+
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/misc.c:113
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "ګېنټه %d"
+msgstr[1] "ګېنټې %d"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/misc.c:119
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "مېنټ %d"
+msgstr[1] "مېنټه %d"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/misc.c:123
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "سېکېنډ %d"
+msgstr[1] "سېکېنډه %d"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
+msgid "Alarm programs"
+msgstr "خبرونې کړنلارې"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
+msgid "Ask for confirmation when deleting items"
+msgstr "د توکيو د ړنګولو پر مهال د باورييلو لپاره پوښتل"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
+msgid "Calendars to run alarms for"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+msgid "Compress weekends in month view"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+msgid "Confirm expunge"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+msgid "Default appointment reminder"
+msgstr "تلواله ټاکنې رايادوونکی"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+msgid "Default reminder units"
+msgstr "تلواله رايادوونکي يوونونه"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+msgid "Default reminder value"
+msgstr "تلواله رايادوونکي ارزښت"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+msgid "Directory for saving alarm audio files"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+msgid "Event Gradient"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+msgid "Event Transparency"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+msgid "Free/busy server URLs"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+msgid "Free/busy template URL"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+msgid "Gradient of the events in calendar views."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+msgid "Hide completed tasks"
+msgstr "بشپړې شوې دندې پټول"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+msgid "Hide task units"
+msgstr "دنده يوونونه پټول"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+msgid "Hide task value"
+msgstr "دنده ارزښت پټول"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+msgid "Horizontal pane position"
+msgstr "د پروت چوکاټ ځای"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+msgid "Last alarm time"
+msgstr "د وروستۍ خبرونې مهال"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+msgid "List of server URLs for free/busy publishing."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+msgid "Marcus Bains Line"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "Marcus Bains Line Color - Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+msgid "Marcus Bains Line Color - Time bar"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+msgid "Minute the workday ends on, 0 to 59."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+msgid "Minute the workday starts on, 0 to 59."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+msgid "Month view horizontal pane position"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+msgid "Month view vertical pane position"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Number of units for determining a default reminder."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+msgid "Number of units for determining when to hide tasks."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+msgid "Overdue tasks color"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+msgid ""
+"Position of the vertical pane, between the task list and the task preview "
+"pane, in pixels."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+msgid "Programs that are allowed to be run by alarms."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+msgid "Save directory for alarm audio"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+msgid "Show Role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+msgid "Show appointment end times in week and month views"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+msgid "Show categories field in the event/meeting/task editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+msgid "Show display alarms in notification tray"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+msgid "Show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "Show the \"Preview\" pane"
+msgstr "چوکاټ ښودل \"Preview\""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:123
+msgid "Show the \"Preview\" pane."
+msgstr ".چوکاټ ښودل \"Preview\""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+msgid "Show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+msgid "Show week numbers in date navigator"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+msgid "Tasks due today color"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+msgid "Tasks vertical pane position"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+msgid "Time divisions"
+msgstr "مهال وېشنې"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+msgid "Time the last alarm ran, in time_t."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../plugins/startup-wizard/startup-wizard.c:108
+msgid "Timezone"
+msgstr "مهالسېمه"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+msgid ""
+"Transparency of the events in calendar views, a value between 0 "
+"(transparent) and 1 (opaque)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+msgid "Twenty four hour time format"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+msgid "Week start"
+msgstr "د اونۍ پېل"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+msgid "Whether or not to use the notification tray for display alarms."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+msgid "Whether to display the end time of events in the week and month views."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+msgid "Whether to set a default reminder for appointments."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+msgid "Whether to show week numbers in the date navigator."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+msgid "Whether to use daylight savings time while displaying events."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+msgid "Work days"
+msgstr "دنده ورځې"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+msgid "Workday end hour"
+msgstr "د دندې ورځې وروستۍ ګېنټه"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+msgid "Workday end minute"
+msgstr "د دندې ورځې وروستی مېنټ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+msgid "Workday start hour"
+msgstr "د دندې ورځې پېل ګېنټه"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+msgid "Workday start minute"
+msgstr "د دندې ورځې پېل مېنټ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+msgid "daylight savings time"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:72
+msgid "Summary contains"
+msgstr "لنډيز لري"
+
+#: ../calendar/gui/cal-search-bar.c:73
+msgid "Description contains"
+msgstr "سپړاوی لري"
+
+#: ../calendar/gui/cal-search-bar.c:74
+msgid "Category is"
+msgstr "ټولۍ ده"
+
+#: ../calendar/gui/cal-search-bar.c:75
+msgid "Comment contains"
+msgstr "څرګندون لري"
+
+#: ../calendar/gui/cal-search-bar.c:76
+msgid "Location contains"
+msgstr "ځای لري"
+
+#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
+#: ../calendar/gui/cal-search-bar.c:684
+msgid "Unmatched"
+msgstr "بېساری"
+
+#: ../calendar/gui/cal-search-bar.c:630
+msgid "Next 7 Days' Tasks"
+msgstr "د راتلونکو ۷ ورځو دندې"
+
+#: ../calendar/gui/cal-search-bar.c:634
+msgid "Active Tasks"
+msgstr "چارنده دندې"
+
+#: ../calendar/gui/cal-search-bar.c:638
+msgid "Overdue Tasks"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:642
+msgid "Completed Tasks"
+msgstr "بشپړې شوې دندې"
+
+#: ../calendar/gui/cal-search-bar.c:646
+msgid "Tasks with Attachments"
+msgstr "دندې د نښلنونو سره"
+
+#: ../calendar/gui/cal-search-bar.c:692
+msgid "Active Appointments"
+msgstr "چارندې ټاکنې"
+
+#: ../calendar/gui/cal-search-bar.c:696
+msgid "Next 7 Days' Appointments"
+msgstr "د راتلونکو ۷ ورځو ټاکنې"
+
+#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "چاپول"
+
+#: ../calendar/gui/calendar-commands.c:317
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+
+#: ../calendar/gui/calendar-commands.c:323
+msgid "Purge events older than"
+msgstr ""
+
+#: ../calendar/gui/calendar-commands.c:328
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/calendar-http/calendar-http.c:281
+#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../plugins/google-account-setup/google-source.c:403
+#: ../widgets/misc/e-send-options.glade.h:39
+msgid "days"
+msgstr "ورځې"
+
+#. Create the On the web source group
+#. Create the LDAP source group
+#. Create the Webcal source group
+#. Create the LDAP source group
+#: ../calendar/gui/calendar-component.c:274
+#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
+#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
+#: ../calendar/gui/tasks-component.c:232
+msgid "On The Web"
+msgstr "په ګورت کې"
+
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
+msgid "Birthdays & Anniversaries"
+msgstr "زوکړې او کليزې"
+
+#. Create the weather group
+#: ../calendar/gui/calendar-component.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:100
+msgid "Weather"
+msgstr "هوا"
+
+#: ../calendar/gui/calendar-component.c:616
+msgid "_New Calendar"
+msgstr "نوی کليز_"
+
+#: ../calendar/gui/calendar-component.c:617
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2090
+msgid "_Copy..."
+msgstr "...لمېسل_"
+
+#: ../calendar/gui/calendar-component.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2104
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "ځانتياوې_"
+
+#: ../calendar/gui/calendar-component.c:950
+msgid "Failed upgrading calendars."
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1249
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1265
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1378
+msgid "Calendar Source Selector"
+msgstr "کليز سرچينه ټاکوونکی"
+
+#: ../calendar/gui/calendar-component.c:1596
+msgid "New appointment"
+msgstr "نوې ټاکنه"
+
+#: ../calendar/gui/calendar-component.c:1597
+msgid "_Appointment"
+msgstr "ټاکنه_"
+
+#: ../calendar/gui/calendar-component.c:1598
+msgid "Create a new appointment"
+msgstr "نوې ټاکنه جوړول"
+
+#: ../calendar/gui/calendar-component.c:1604
+msgid "New meeting"
+msgstr "نوې کتنه"
+
+#: ../calendar/gui/calendar-component.c:1605
+msgid "M_eeting"
+msgstr "ک_تنه"
+
+#: ../calendar/gui/calendar-component.c:1606
+msgid "Create a new meeting request"
+msgstr "نوې کتل غوښتنه جوړول"
+
+#: ../calendar/gui/calendar-component.c:1612
+msgid "New all day appointment"
+msgstr "نوې ټوله ورځ ټاکنه"
+
+#: ../calendar/gui/calendar-component.c:1613
+msgid "All Day A_ppointment"
+msgstr "ټوله ورځ ټ_اکنه"
+
+#: ../calendar/gui/calendar-component.c:1614
+msgid "Create a new all-day appointment"
+msgstr "نوې ټوله-ورځ ټاکنه جوړول"
+
+#: ../calendar/gui/calendar-component.c:1620
+msgid "New calendar"
+msgstr "نوی کليز"
+
+#: ../calendar/gui/calendar-component.c:1621
+msgid "Cale_ndar"
+msgstr "کل_يز"
+
+#: ../calendar/gui/calendar-component.c:1622
+msgid "Create a new calendar"
+msgstr "نوی کليز جوړول"
+
+#: ../calendar/gui/calendar-view-factory.c:109
+msgid "Day View"
+msgstr "ورځ ليد"
+
+#: ../calendar/gui/calendar-view-factory.c:112
+msgid "Work Week View"
+msgstr "دنده اونۍ ليد"
+
+#: ../calendar/gui/calendar-view-factory.c:115
+msgid "Week View"
+msgstr "اونۍ ليد"
+
+#: ../calendar/gui/calendar-view-factory.c:118
+msgid "Month View"
+msgstr "مياشت ليد"
+
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "هر ډګر"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "نښلنونه"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "ګډونوال"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "سوداګري"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "ټولۍ"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "ډلونه"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "سيالي"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:539
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "پټ"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "سپړاوی"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
+msgid "Description Contains"
+msgstr "سپړاوی لري"
+
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "شتون نه لري"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "شتون لري"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "خواپوري"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "سوغات"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "موخې"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "چوټي"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "چوټي کارډونه"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "نړېوال"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "کيلۍ پېرودونکی"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "ګډوډ"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "راتلونکې ۷ ورځې"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "ټيليفوني اړيکې"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:538
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "وګړيز"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:537 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "خپور"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:298
+msgid "Recurrence"
+msgstr "بياپېښېدنه"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "انکړ"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40 ../mail/mail-dialogs.glade.h:20
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "لنډيز"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
+msgid "Summary Contains"
+msgstr "لنډيز لري"
+
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "VIP"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "تمه کيږي"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "لري"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "نه لري"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "دی"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "نه دی"
+
+#: ../calendar/gui/comp-editor-factory.c:405
+msgid "Error while opening the calendar"
+msgstr "د کليز د پرانيستلو پر مهال تېروتنه"
+
+#: ../calendar/gui/comp-editor-factory.c:411
+msgid "Method not supported when opening the calendar"
+msgstr ""
+
+#: ../calendar/gui/comp-editor-factory.c:417
+msgid "Permission denied to open the calendar"
+msgstr "د کليز د پرانيستلو پرېښله ونه منل شوه"
+
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
+msgid "Unknown error"
+msgstr "ناپېژندلې تېروتنه"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
+msgid "Edit Alarm"
+msgstr "خبرونه سمول"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
+msgid "<b>Alarm</b>"
+msgstr "<b>خبرونه</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
+msgid "<b>Options</b>"
+msgstr "<b>غوراوي</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
+msgid "<b>Repeat</b>"
+msgstr "<b>بياځلي</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
+msgid "Add Alarm"
+msgstr "خبرونه زياتول"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
+msgid "Custom _message"
+msgstr "دوديزه _استوزه"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+msgid "Custom alarm sound"
+msgstr "دوديز خبرونې غږ"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Mes_sage:"
+msgstr ":است_وزه"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/e-alarm-list.c:442
+msgid "Play a sound"
+msgstr "غږ غږول"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/e-alarm-list.c:446
+msgid "Pop up an alert"
+msgstr "خبروونی بړبوکول"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/e-alarm-list.c:454
+msgid "Run a program"
+msgstr "کړنلار ځغلول"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+msgid "Select A File"
+msgstr "يوه دوتنه وټاکئ"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr ":ته لېږل"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/e-alarm-list.c:450
+msgid "Send an email"
+msgstr "برېښليک لېږل"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+msgid "_Arguments:"
+msgstr ":ارزښتمنۍ_"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+msgid "_Program:"
+msgstr ":کړنلار_"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+msgid "_Repeat the alarm"
+msgstr "خبرونه د سرول_"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+msgid "_Sound:"
+msgstr ":غږ_"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+msgid "after"
+msgstr "وروسته"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+msgid "before"
+msgstr "مخکې"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "day(s)"
+msgstr "ورځ(ې)"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+msgid "end of appointment"
+msgstr "د ټاکنې پای"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "ډېر مهال هر"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+msgid "hour(s)"
+msgstr "ګېنټه"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:242
+msgid "minute(s)"
+msgstr "مېنټه"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
+msgid "start of appointment"
+msgstr "د ټاکنې پېل"
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
+msgid "Action/Trigger"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "ز_ياتول"
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:4
+msgid "Alarms"
+msgstr "خبرونې"
+
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../composer/e-composer-actions.c:64
+msgid "_Suggest automatic display of attachment"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
+msgid "Attach file(s)"
+msgstr "دوتنې نښلول"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+msgid "Selected Calendars for Alarms"
+msgstr "د خبرونو لپاره ټاکل شوي کليزونه"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid ""
+"60 minutes\n"
+"30 minutes\n"
+"15 minutes\n"
+"10 minutes\n"
+"05 minutes"
+msgstr ""
+"مېنټه ‎۶۰\n"
+"مېنټه ‎۳۰\n"
+"مېنټه ‎۱۵\n"
+"مېنټه ‎۱۰\n"
+"مېنټه ‎۰۵"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, no-c-format
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../mail/mail-config.glade.h:10
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr "<span weight=\"bold\">خبرونې</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgstr "<span weight=\"bold\">تلواله وزګار/بوخت پالنګر</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../mail/mail-config.glade.h:17
+#: ../plugins/publish-calendar/publish-calendar.glade.h:1
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">ټولګړي</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "<span weight=\"bold\">دنده لړ</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "<span weight=\"bold\">Time</span>"
+msgstr "<span weight=\"bold\">مهال</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr "<span weight=\"bold\">دنده اونۍ</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Adjust for daylight sa_ving time"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "Day _ends:"
+msgstr ":ورځ _پايږي"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+msgid "Display"
+msgstr "ښوون"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
+msgid "Friday"
+msgstr "جومه"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr ""
+"مېنټه\n"
+"ګېنټې\n"
+"ورځې"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
+msgid "Monday"
+msgstr "دوه نۍ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
+"دوه نۍ\n"
+"درې نۍ\n"
+"منځنۍ\n"
+"پينځه نۍ\n"
+"جومه\n"
+"نۍ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../mail/mail-config.glade.h:112
+msgid "Pick a color"
+msgstr "يو رنګ وټاکئ"
+
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "S_un"
+msgstr "ي_وه نۍ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
+msgid "Saturday"
+msgstr "نۍ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+msgid "Select the calendars for alarm notification"
+msgstr "د خبرونې يادښتونو لپاره کليزونه وټاکئ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Sh_ow a reminder"
+msgstr "رايادوونی ښو_دل"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "Show week _numbers in date navigator"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
+msgid "Sunday"
+msgstr "يوه نۍ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "T_asks due today:"
+msgstr ""
+
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "T_hu"
+msgstr "پ_ينځه نۍ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Template:"
+msgstr ":کونده"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
+msgid "Thursday"
+msgstr "درې نۍ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+msgid "Time _zone:"
+msgstr ":مهال _سيمه"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "Time format:"
+msgstr ":مهال بڼه"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
+msgid "Tuesday"
+msgstr "درې نۍ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
+msgid "Wednesday"
+msgstr "منځنۍ"
+
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "Wee_k starts on:"
+msgstr ":اون_ۍ پېليږي په"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+msgid "Work days:"
+msgstr ":دنده ورځې"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+msgid "_12 hour (AM/PM)"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+msgid "_24 hour"
+msgstr "ګېنټې‎ ۲۴_"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+msgid "_Compress weekends in month view"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+msgid "_Day begins:"
+msgstr ":ورځ پېليږي_"
+
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+msgid "_Fri"
+msgstr "جومه_"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+msgid "_Hide completed tasks after"
+msgstr "بشپړې شوې دندې پټول وروسته له_"
+
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+msgid "_Mon"
+msgstr "دوه نۍ_"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+msgid "_Overdue tasks:"
+msgstr ""
+
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+msgid "_Sat"
+msgstr "نۍ_"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+msgid "_Show appointment end times in week and month view"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+msgid "_Time divisions:"
+msgstr ""
+
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+msgid "_Tue"
+msgstr "درې نۍ"
+
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+msgid "_Wed"
+msgstr "منځنۍ"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+msgid "before every appointment"
+msgstr "د هرې ټاکنې نه مخکې"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:269
+msgid "Cop_y calendar contents locally for offline operation"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:271
+msgid "Cop_y task list contents locally for offline operation"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:273
+msgid "Cop_y memo list contents locally for offline operation"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+msgid "Colo_r:"
+msgstr ":رن_ګ"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+msgid "Task List"
+msgstr "دنده لړ"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+msgid "Memo List"
+msgstr "ميمو لړ"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:474
+msgid "Calendar Properties"
+msgstr "د کليز ځانتياوې"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:474
+msgid "New Calendar"
+msgstr "نوی کليز"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:530
+msgid "Task List Properties"
+msgstr "د دنده لړ ځانتياوې"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:530
+msgid "New Task List"
+msgstr "نوی دنده لړ"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
+msgid "Memo List Properties"
+msgstr "د ميمو لړ ځانتياوې"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
+msgid "New Memo List"
+msgstr "نوی ميمو لړ"
+
+#: ../calendar/gui/dialogs/changed-comp.c:58
+msgid "This event has been deleted."
+msgstr ".دا پېښه وړنګول شوه"
+
+#: ../calendar/gui/dialogs/changed-comp.c:62
+msgid "This task has been deleted."
+msgstr ".دا دنده وړنګول شوه"
+
+#: ../calendar/gui/dialogs/changed-comp.c:66
+msgid "This memo has been deleted."
+msgstr ".دا ميمو وړنګول شوه"
+
+#: ../calendar/gui/dialogs/changed-comp.c:75
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:82
+msgid "This event has been changed."
+msgstr ".دا پېښه بدله شوه"
+
+#: ../calendar/gui/dialogs/changed-comp.c:86
+msgid "This task has been changed."
+msgstr ".دا دنده بدله شوه"
+
+#: ../calendar/gui/dialogs/changed-comp.c:90
+msgid "This memo has been changed."
+msgstr ".دا ميمو بدله شوه"
+
+#: ../calendar/gui/dialogs/changed-comp.c:99
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2340
+msgid " to "
+msgstr "ته"
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2344
+msgid " (Completed "
+msgstr "بشپړ شوی) "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2346
+msgid "Completed "
+msgstr "بشپړ شوی"
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2351
+msgid " (Due "
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2353
+msgid "Due "
+msgstr "کول"
+
+#: ../calendar/gui/dialogs/comp-editor.c:231
+#, c-format
+msgid "Attached message - %s"
+msgstr "%s - ‎نښتې استوزه"
+
+#. translators, this count will always be >1
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
+#: ../composer/e-msg-composer.c:1991
+#, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "نښتې استوزه"
+msgstr[1] "نښتې استوزې ‎%d"
+
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
+msgid "_Move"
+msgstr "خوځول_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2049
+msgid "Cancel _Drag"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../widgets/misc/e-attachment-bar.c:453
+msgid "attachment"
+msgstr "نښلن"
+
+#: ../calendar/gui/dialogs/comp-editor.c:841
+msgid "Could not update object"
+msgstr "څيز نه شي اوسمهالولی"
+
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "ټاکنه سمول"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "%s - کتنه"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "%s - ټاکنه"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "%s - ټاکل شوې دنده"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr " %s - دنده"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr " %s - ميمو"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "هېڅ لنډيز"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "د اوسنۍ کړکۍ بندولو لپاره دلته کېکاږﺉ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "ټاکل شوې ليکنه ټوټه دړې ته لمېسل"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "ټاکل شوې ليکنه ټوټه دړې ته سکڼل"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "د شته مرستې د کتلو لپاره دلته کېکاږﺉ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "له ټوټه دړې ليکنه سرېښل"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "ټوله ليکنه ټاکل"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
+msgid "_File"
+msgstr "دوتنه_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:45
+msgid "_Help"
+msgstr "مرسته_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "ورننويستل_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "غوراوي_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2082
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:54
+msgid "_View"
+msgstr "ليد_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "...نښلن_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "د دوتنې د نښلولو لپاره دلته کېکاږﺉ"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "ټولۍ_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "مهال _سيمه"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "ټو_ليز"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "لکه ټوليز ډلول"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "وګړيز_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "لکه وګړيز ډلول"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "پټ_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "لکه پټ ډلول"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "انکړ ډګر_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "ډول ډګر_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "اوسني لاسو_ندونه"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "نښلول"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
+#, c-format
+msgid "<b>%d</b> Attachment"
+msgid_plural "<b>%d</b> Attachments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1911
+msgid "Hide Attachment _Bar"
+msgstr "نښلن _پټه پټول"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
+msgid "Show Attachment _Bar"
+msgstr "نښلن _پټه ښودل"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "ړنګول_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2036
+#: ../composer/e-msg-composer.c:1049
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "...نښلن زياتول_"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../mail/em-format-html-display.c:2196
+msgid "Show Attachments"
+msgstr "نښلنونه ښودل"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+msgid "Press space key to toggle attachment bar"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
+msgid "Changes made to this item may be discarded if an update arrives"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:3315
+msgid "Unable to use current version!"
+msgstr "اوسنۍ نسخه نه شي کارولی"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+msgid "Could not open source"
+msgstr "سرچينه نه شي پرانيستلی"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+msgid "Could not open destination"
+msgstr "موخه نه شي پرانيستلی"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+msgid "Destination is read only"
+msgstr "موخه يواز-لوستې ده"
+
+#: ../calendar/gui/dialogs/delete-comp.c:202
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:53
+msgid "The event could not be deleted due to a corba error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:56
+msgid "The task could not be deleted due to a corba error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:59
+msgid "The memo could not be deleted due to a corba error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:62
+msgid "The item could not be deleted due to a corba error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:69
+msgid "The event could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:72
+msgid "The task could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:75
+msgid "The memo could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:78
+msgid "The item could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:85
+msgid "The event could not be deleted due to an error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:88
+msgid "The task could not be deleted due to an error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:91
+msgid "The memo could not be deleted due to an error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:94
+msgid "The item could not be deleted due to an error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+msgid "Contacts..."
+msgstr "اړيکلوري"
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-delegates.c:415
+msgid "Delegate To:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+msgid "Enter Delegate"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "خبرونې_"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "بياپېښېدنه_"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "د لېږلو غوراوي"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "وزګار/بوخت_"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:295
+msgid "Appoint_ment"
+msgstr "ټاک_نه"
+
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
+msgid "This event has alarms"
+msgstr "دا پېښه خبرونې لري"
+
+#: ../calendar/gui/dialogs/event-page.c:795
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
+msgid "Or_ganizer:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:841
+msgid "_Delegatees"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:843
+msgid "Atte_ndees"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1027
+msgid "Event with no start date"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1030
+msgid "Event with no end date"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
+msgid "Start date is wrong"
+msgstr "پېل نېټه ناسمه ده"
+
+#: ../calendar/gui/dialogs/event-page.c:1209
+msgid "End date is wrong"
+msgstr "پای نېټه ناسمه ده"
+
+#: ../calendar/gui/dialogs/event-page.c:1232
+msgid "Start time is wrong"
+msgstr "پېل مهال ناسم دی"
+
+#: ../calendar/gui/dialogs/event-page.c:1239
+msgid "End time is wrong"
+msgstr "پای مهال ناسم دی"
+
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
+msgid "An organizer is required."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
+msgid "At least one attendee is required."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
+msgid "_Add "
+msgstr "زياتول_"
+
+#: ../calendar/gui/dialogs/event-page.c:2591
+#, c-format
+msgid "Unable to open the calendar '%s'."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
+#, c-format
+msgid "You are acting on behalf of %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:2915
+#, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/dialogs/event-page.c:2921
+#, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/dialogs/event-page.c:2927
+#, c-format
+msgid "%d minute before appointment"
+msgid_plural "%d minutes before appointment"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/dialogs/event-page.c:2940
+msgid "Customize"
+msgstr "دوديزول"
+
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/event-page.c:2945
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:669
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:943
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
+#: ../plugins/calendar-weather/calendar-weather.c:370
+#: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:2022
+#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-signature-combo-box.c:69
+msgid "None"
+msgstr "هېڅ"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+msgid "1 day before appointment"
+msgstr "د ټاکنې نه ۱ ورځ مخکې"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:2
+msgid "1 hour before appointment"
+msgstr "د ټاکنې نه ۱ ګېنټه مخکې"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:3
+msgid "15 minutes before appointment"
+msgstr "د ټاکنې نه ۱۵ مېنټه مخکې"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:5
+msgid "Attendee_s..."
+msgstr "...ګډونوا_ل"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:8
+msgid "Custom Alarm:"
+msgstr ":دوديز خبرونی"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:9
+msgid "D_escription:"
+msgstr ":سپړاوی_"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:10
+msgid "Event Description"
+msgstr "د پېښې سپړاوی"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.glade.h:6
+msgid "Su_mmary:"
+msgstr ":لن_ډيز"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+msgid "_Alarm"
+msgstr "خبروونی_"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+msgid "_Time:"
+msgstr ":مهال_"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "for"
+msgstr "لپاره د"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
+msgid "until"
+msgstr "تر"
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:1
+msgid "<b>Att_endees</b>"
+msgstr "<b>ګډ_ونوالان</b>"
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:2
+msgid "C_hange Organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "Co_ntacts..."
+msgstr "...اړ_يکلوري"
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2448
+msgid "Memo"
+msgstr "ميمو"
+
+#: ../calendar/gui/dialogs/memo-page.c:847
+#, c-format
+msgid "Unable to open memos in '%s'."
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+msgid "To"
+msgstr "ته"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr ":پې_ل نېټه"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:5
+msgid "T_o:"
+msgstr ":ت_ه"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+msgid "_Description:"
+msgstr ":سپړاوی_"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.c:360
+#: ../calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Group:"
+msgstr ":ډله_"
+
+#: ../calendar/gui/dialogs/recur-comp.c:50
+#, c-format
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:52
+#, c-format
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:56
+#, c-format
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:60
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:85
+msgid "This Instance Only"
+msgstr "يوازې دا بېلګه"
+
+#: ../calendar/gui/dialogs/recur-comp.c:89
+msgid "This and Prior Instances"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:95
+msgid "This and Future Instances"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:100
+msgid "All Instances"
+msgstr "ټولې بېلګې"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:560
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:890
+msgid "Recurrence date is invalid"
+msgstr "د بياپېښېدنې نېټه سمه نه ده"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
+#: ../calendar/gui/dialogs/recurrence-page.c:928
+msgid "on"
+msgstr "په"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:992
+msgid "first"
+msgstr "لومړی"
+
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:998
+msgid "second"
+msgstr "دوېم"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
+msgid "third"
+msgstr "درېم"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
+msgid "fourth"
+msgstr "څلورم"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
+msgid "last"
+msgstr "وروستی"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
+#. * (dropdown menu options are in [square brackets]).
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+msgid "Other Date"
+msgstr "بله نېټه"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+msgid "1st to 10th"
+msgstr "نه تر ۱۰م ‎۱"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
+msgid "11th to 20th"
+msgstr "۱۱م نه تر ۲۰م"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
+msgid "21st to 31st"
+msgstr "۲۱م نه تر ۳۱م"
+
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
+msgid "day"
+msgstr "ورځ"
+
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
+#. * (dropdown menu options are in [square brackets])."
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
+msgid "on the"
+msgstr "په"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
+msgid "occurrences"
+msgstr "پېښېدنې"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
+msgid "Add exception"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
+msgid "Could not get a selection to modify."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
+msgid "Modify exception"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
+msgid "Could not get a selection to delete."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
+msgid "Date/Time"
+msgstr "نېټه/مهال"
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
+msgid "<b>Exceptions</b>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
+#: ../mail/mail-config.glade.h:3
+msgid "<b>Preview</b>"
+msgstr "<b>مخليد</b>"
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
+msgid "<b>Recurrence</b>"
+msgstr "<b>بياپېښېدنه</b>"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "Every"
+msgstr "هر"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "This appointment rec_urs"
+msgstr "دا ټاکنه بيا_پېښيږي"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "forever"
+msgstr "تل"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
+msgid "month(s)"
+msgstr "مياشت(ې)"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
+msgid "week(s)"
+msgstr "اوونۍ"
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
+msgid "year(s)"
+msgstr "کال(ه)"
+
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
+msgid "Completed date is wrong"
+msgstr "د بشپړېدو نېټه ناسمه ده"
+
+#: ../calendar/gui/dialogs/task-details-page.c:478
+msgid "Web Page"
+msgstr "ګورت پاڼه"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "<span weight=\"bold\">Miscellaneous</span>"
+msgstr "<span weight=\"bold\">ګډوډ</span>"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">انکړ</span>"
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/dialogs/task-details-page.glade.h:4
+#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:634 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/print.c:2520 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
+msgid "Completed"
+msgstr "بشپړ شوی"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:5
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:559 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
+msgid "High"
+msgstr "لوړ"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:6
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model-tasks.c:356
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-cal-model-tasks.c:750
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:633 ../calendar/gui/print.c:2517
+msgid "In Progress"
+msgstr "په پرمختګ کې"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:7
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:561 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
+msgid "Low"
+msgstr "ټيټ"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:8
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:560
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
+msgid "Normal"
+msgstr "لېوی"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:260
+#: ../calendar/gui/e-cal-model-tasks.c:354
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:632 ../calendar/gui/print.c:2514
+#: ../calendar/gui/tasktypes.xml.h:33
+msgid "Not Started"
+msgstr "نه دی پېل شوی"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+msgid "P_ercent complete:"
+msgstr ":س_لنه بشپړ شوی"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Stat_us:"
+msgstr ":انک_ړ"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/e-calendar-table.c:562 ../calendar/gui/tasktypes.xml.h:44
+msgid "Undefined"
+msgstr "ناپېژندلی"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+msgid "_Date completed:"
+msgstr ":د بشپړېدو نېټه_"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../widgets/misc/e-send-options.glade.h:34
+msgid "_Priority:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Web Page:"
+msgstr ":ګورت پاڼه_"
+
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "انکړ خبرتياوې_"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+msgid "Click to change or view the status details of the task"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "د لېږلو غوراوي_"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/tasks-component.c:1326
+msgid "_Task"
+msgstr "دنده_"
+
+#: ../calendar/gui/dialogs/task-editor.c:320
+msgid "Task Details"
+msgstr "د دندې خبرتياوې"
+
+#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Organi_zer:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:781
+msgid "Due date is wrong"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:1750
+#, c-format
+msgid "Unable to open tasks in '%s'."
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
+msgstr "...ګډو_نوالان"
+
+#: ../calendar/gui/dialogs/task-page.glade.h:2
+msgid "Categor_ies..."
+msgstr "...ټول_ۍ"
+
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "De_scription:"
+msgstr ":سپ_ړاوی"
+
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+msgid "Time zone:"
+msgstr ":مهال سيمه"
+
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+msgid "_Due date:"
+msgstr ":د کولو نېټه_"
+
+#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:392
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "ورځ %d"
+msgstr[1] "ورځې %d"
+
+#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:398
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "اونۍ %d"
+msgstr[1] "اونۍ %d"
+
+#: ../calendar/gui/e-alarm-list.c:460
+msgid "Unknown action to be performed"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:474
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:479
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr ""
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:486
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:497
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:502
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr ""
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:509
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
+#: ../calendar/gui/e-alarm-list.c:533
+#, c-format
+msgid "%s at %s"
+msgstr ""
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound". "Trigger types" are absolute or relative dates
+#: ../calendar/gui/e-alarm-list.c:541
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
+#, c-format
+msgid "Click to open %s"
+msgstr "پرانيستلو لپاره کېکاږﺉ %s د"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:856
+msgid "Untitled"
+msgstr "بېسرليکه"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
+msgid "Start Date:"
+msgstr "پېل نېټه:"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-itip-control.c:1218
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
+#: ../widgets/misc/e-attachment.glade.h:2
+msgid "Description:"
+msgstr ":سپړاوی"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
+msgid "Web Page:"
+msgstr "ګورت پاڼه:"
+
+#: ../calendar/gui/e-cal-component-preview.c:210
+#: ../calendar/gui/e-itip-control.c:1162
+#: ../calendar/gui/e-itip-control.glade.h:9
+msgid "Summary:"
+msgstr "لنډيز:"
+
+#: ../calendar/gui/e-cal-component-preview.c:239
+msgid "Due Date:"
+msgstr "د کولو نېټه:"
+
+#. write status
+#. Status
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
+#: ../plugins/itip-formatter/itip-view.c:1027
+msgid "Status:"
+msgstr ":انکړ"
+
+#: ../calendar/gui/e-cal-component-preview.c:270
+msgid "Priority:"
+msgstr ""
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "پای نېټه"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
+msgid "Start Date"
+msgstr "پېل نېټه"
+
+#: ../calendar/gui/e-cal-model-calendar.c:183
+#: ../calendar/gui/e-calendar-table.c:611
+msgid "Free"
+msgstr "پاتې"
+
+#: ../calendar/gui/e-cal-model-calendar.c:186
+#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-meeting-time-sel.c:398
+msgid "Busy"
+msgstr "بوخت"
+
+#: ../calendar/gui/e-cal-model-tasks.c:623
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:746
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
+msgid "Yes"
+msgstr "هو"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:165
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+msgid "No"
+msgstr "نه"
+
+#. This is the default filename used for temporary file creation
+#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
+#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
+#: ../plugins/itip-formatter/itip-formatter.c:410
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:55
+msgid "Unknown"
+msgstr "ناپېژندلی"
+
+#: ../calendar/gui/e-cal-model.c:968
+msgid "Recurring"
+msgstr "بياپېښيږي"
+
+#: ../calendar/gui/e-cal-model.c:970
+msgid "Assigned"
+msgstr "ټاکل شوی"
+
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
+msgid "Save As..."
+msgstr "...ساتل په"
+
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2030
+msgid "Select folder to save selected attachments..."
+msgstr ""
+
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
+#, c-format
+msgid "untitled_image.%s"
+msgstr ""
+
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1568
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+msgid "_Save As..."
+msgstr "...ساتل په_"
+
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
+#: ../mail/em-popup.c:574
+msgid "Set as _Background"
+msgstr "لکه _شاليد ټاکل"
+
+#: ../calendar/gui/e-cal-popup.c:287
+msgid "_Save Selected"
+msgstr "ټاکل شوی ساتل_"
+
+#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
+#, c-format
+msgid "Open in %s..."
+msgstr "پرانيستل... %s په"
+
+#: ../calendar/gui/e-calendar-table.c:330
+#, fuzzy
+msgid "* No Summary *"
+msgstr "هېڅ لنډيز"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr ""
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:369
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:400
+#, fuzzy
+msgid "Start: "
+msgstr "پېلول"
+
+#: ../calendar/gui/e-calendar-table.c:412
+#, fuzzy
+msgid "Due: "
+msgstr "کول"
+
+#: ../calendar/gui/e-calendar-table.c:581
+msgid "0%"
+msgstr "۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:582
+msgid "10%"
+msgstr "۱۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:583
+msgid "20%"
+msgstr "۲۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:584
+msgid "30%"
+msgstr "۳۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:585
+msgid "40%"
+msgstr "۴۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:586
+msgid "50%"
+msgstr "۵۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:587
+msgid "60%"
+msgstr "۶۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:588
+msgid "70%"
+msgstr "۷۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:589
+msgid "80%"
+msgstr "۸۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:590
+msgid "90%"
+msgstr "۹۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:591
+msgid "100%"
+msgstr "۱۰۰٪"
+
+#: ../calendar/gui/e-calendar-table.c:871
+#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
+msgid "Deleting selected objects"
+msgstr "ټاکل شوي څيزونه ړنګول کيږي"
+
+#: ../calendar/gui/e-calendar-table.c:1155
+#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
+msgid "Updating objects"
+msgstr "څيزونه اوسمهالول کيږي"
+
+#: ../calendar/gui/e-calendar-table.c:1340
+#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:278
+msgid "Save as..."
+msgstr "...ساتل په"
+
+#: ../calendar/gui/e-calendar-table.c:1563
+#: ../calendar/gui/e-calendar-view.c:1663
+msgid "New _Task"
+msgstr "نوې _دنده"
+
+#: ../calendar/gui/e-calendar-table.c:1567 ../calendar/gui/e-memo-table.c:925
+msgid "Open _Web Page"
+msgstr "ګورت _پاڼه پرانيستل"
+
+#: ../calendar/gui/e-calendar-table.c:1569
+#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
+msgid "P_rint..."
+msgstr "چاپول..._"
+
+#: ../calendar/gui/e-calendar-table.c:1573
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
+#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "س_کڼل"
+
+#: ../calendar/gui/e-calendar-table.c:1575
+#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
+msgid "_Paste"
+msgstr "سرېښل_"
+
+#: ../calendar/gui/e-calendar-table.c:1579 ../ui/evolution-tasks.xml.h:22
+msgid "_Assign Task"
+msgstr "دنده ټاکل_"
+
+#: ../calendar/gui/e-calendar-table.c:1580 ../calendar/gui/e-memo-table.c:937
+#: ../ui/evolution-tasks.xml.h:26
+msgid "_Forward as iCalendar"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:1581
+msgid "_Mark as Complete"
+msgstr "لکه بشپړ نښول_"
+
+#: ../calendar/gui/e-calendar-table.c:1582
+msgid "_Mark Selected Tasks as Complete"
+msgstr "ټاکل شوې دنده لکه بشپړه نښول_"
+
+#: ../calendar/gui/e-calendar-table.c:1583
+msgid "_Mark as Incomplete"
+msgstr "لکه نابشپړ نښول_"
+
+#: ../calendar/gui/e-calendar-table.c:1584
+msgid "_Mark Selected Tasks as Incomplete"
+msgstr "ټاکل شوې دنده لکه نابشپړه نښول_"
+
+#: ../calendar/gui/e-calendar-table.c:1589
+msgid "_Delete Selected Tasks"
+msgstr "ټاکل شوې دنده ړنګول_"
+
+#: ../calendar/gui/e-calendar-table.c:1826
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "د دندې زياتولو لپاره کېکاږﺉ"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.etspec.h:5
+msgid "Complete"
+msgstr "بشپړ"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:6
+msgid "Completion date"
+msgstr "د بشپړېدو نېټه"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+msgid "Due date"
+msgstr "د کولو نېټه"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
+msgid "Priority"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+msgid "Start date"
+msgstr "پېل نېټه"
+
+#: ../calendar/gui/e-calendar-view.c:1349
+msgid "Moving items"
+msgstr "توکي خوځيږي"
+
+#: ../calendar/gui/e-calendar-view.c:1351
+msgid "Copying items"
+msgstr "توکي لمېسل کيږي"
+
+#: ../calendar/gui/e-calendar-view.c:1660
+msgid "New _Appointment..."
+msgstr "...نوې _ټاکنه"
+
+#: ../calendar/gui/e-calendar-view.c:1661
+msgid "New All Day _Event"
+msgstr "نوې ټوله ورځ _پېښه"
+
+#: ../calendar/gui/e-calendar-view.c:1662
+msgid "New _Meeting"
+msgstr "نوې _کتنه"
+
+#. FIXME: hook in this somehow
+#: ../calendar/gui/e-calendar-view.c:1673
+msgid "_Current View"
+msgstr "اوسنی ليد_"
+
+#: ../calendar/gui/e-calendar-view.c:1675
+msgid "Select T_oday"
+msgstr "ن_ن ټاکل"
+
+#: ../calendar/gui/e-calendar-view.c:1676
+msgid "_Select Date..."
+msgstr "...نېټه ټاکل_"
+
+#: ../calendar/gui/e-calendar-view.c:1682
+msgid "Pri_nt..."
+msgstr "...چاپ_ول"
+
+#: ../calendar/gui/e-calendar-view.c:1692
+msgid "Cop_y to Calendar..."
+msgstr "...کليز ته لمېس_ل"
+
+#: ../calendar/gui/e-calendar-view.c:1693
+msgid "Mo_ve to Calendar..."
+msgstr "...کليز ته خو_ځول"
+
+#: ../calendar/gui/e-calendar-view.c:1694
+msgid "_Delegate Meeting..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1695
+msgid "_Schedule Meeting..."
+msgstr "...مهالوېش کتنه_"
+
+#: ../calendar/gui/e-calendar-view.c:1696
+msgid "_Forward as iCalendar..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1697
+msgid "_Reply"
+msgstr "ځوابول_"
+
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
+#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
+#: ../ui/evolution-mail-message.xml.h:82
+msgid "Reply to _All"
+msgstr "ټول ځوابول_"
+
+#: ../calendar/gui/e-calendar-view.c:1703
+msgid "Make this Occurrence _Movable"
+msgstr "دا پېښېدنه _خوځېدونکې کول"
+
+#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
+msgid "Delete this _Occurrence"
+msgstr "دا _پېښېدنه ړنګول"
+
+#: ../calendar/gui/e-calendar-view.c:1705
+msgid "Delete _All Occurrences"
+msgstr "ټولې _پېښېدنې ړنګول"
+
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2477
+#, c-format
+msgid "Location: %s"
+msgstr "%s ‎:ځای"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:2278
+#, c-format
+msgid "Time: %s %s"
+msgstr "%s %s ‎:مهال"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: ../calendar/gui/e-cell-date-edit-text.c:116
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %m/%d/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: ../calendar/gui/e-cell-date-edit-text.c:119
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+#: ../calendar/gui/e-cell-date-edit-text.c:127
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"%s"
+msgstr ""
+
+#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
+#. * to change the length of the time division in the calendar day view, e.g.
+#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
+#.
+#: ../calendar/gui/e-day-view-time-item.c:589
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#. strftime format %A = full weekday name, %d = day of
+#. month, %B = full month name. You can change the
+#. order but don't change the specifiers or add
+#. anything.
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
+msgid "%A %d %B"
+msgstr "%A %d %B"
+
+#. String to use in 12-hour time format for times in the morning.
+#: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
+#: ../calendar/gui/print.c:813
+msgid "am"
+msgstr "غ.م"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
+#: ../calendar/gui/print.c:815
+msgid "pm"
+msgstr "غ.و"
+
+#: ../calendar/gui/e-itip-control.c:765
+msgid "Yes. (Complex Recurrence)"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:782
+#, c-format
+msgid "Every day"
+msgid_plural "Every %d days"
+msgstr[0] "هره ورځ"
+msgstr[1] "ورځې %d هر"
+
+#: ../calendar/gui/e-itip-control.c:795
+#, c-format
+msgid "Every week"
+msgid_plural "Every %d weeks"
+msgstr[0] "هره اونۍ"
+msgstr[1] "اونۍ %d هر"
+
+#: ../calendar/gui/e-itip-control.c:802
+#, c-format
+msgid "Every week on "
+msgid_plural "Every %d weeks on "
+msgstr[0] "هره اونۍ په"
+msgstr[1] "اونۍ په %d هر"
+
+#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
+#: ../calendar/gui/e-itip-control.c:813
+msgid " and "
+msgstr "او"
+
+#: ../calendar/gui/e-itip-control.c:822
+#, c-format
+msgid "The %s day of "
+msgstr "ورځ د %s د"
+
+#: ../calendar/gui/e-itip-control.c:838
+#, c-format
+msgid "The %s %s of "
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:849
+#, c-format
+msgid "every month"
+msgid_plural "every %d months"
+msgstr[0] "هره مياشت"
+msgstr[1] "مياشتې %d هر"
+
+#: ../calendar/gui/e-itip-control.c:861
+#, c-format
+msgid "Every year"
+msgid_plural "Every %d years"
+msgstr[0] "هر کال"
+msgstr[1] "کاله %d هر"
+
+#: ../calendar/gui/e-itip-control.c:874
+#, c-format
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] ""
+msgstr[1] ""
+
+#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
+#: ../calendar/gui/e-itip-control.c:885
+msgid ", ending on "
+msgstr ""
+
+#. For Translators : 'starts' is starts:date implying a task starts on what date
+#: ../calendar/gui/e-itip-control.c:907
+msgid "Starts"
+msgstr "پېليږي"
+
+#. For Translators : 'ends' is ends:date implying a task ends on what date
+#: ../calendar/gui/e-itip-control.c:921
+msgid "Ends"
+msgstr "پايږي"
+
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
+msgid "Due"
+msgstr "کول"
+
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
+msgid "iCalendar Information"
+msgstr "خبرتياوې iکليزې"
+
+#. Title
+#: ../calendar/gui/e-itip-control.c:1020
+msgid "iCalendar Error"
+msgstr "تېروتنه iکليزې"
+
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:521
+#: ../plugins/itip-formatter/itip-view.c:522
+msgid "An unknown person"
+msgstr "ناپېژندلی وګړی"
+
+#. Describe what the user can do
+#: ../calendar/gui/e-itip-control.c:1143
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/itip-utils.c:664
+#: ../plugins/itip-formatter/itip-formatter.c:2035
+msgid "Accepted"
+msgstr "منل شوی"
+
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2038
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1199
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
+#: ../plugins/itip-formatter/itip-formatter.c:2041
+msgid "Declined"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1283
+msgid ""
+"The meeting has been canceled, however it could not be found in your "
+"calendars"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1285
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1363
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1364
+msgid "Meeting Information"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1370
+#, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1372
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1373
+msgid "Meeting Proposal"
+msgstr ""
+
+#. FIXME Whats going on here?
+#: ../calendar/gui/e-itip-control.c:1379
+#, c-format
+msgid "<b>%s</b> wishes to be added to an existing meeting."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1380
+msgid "Meeting Update"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1384
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1385
+msgid "Meeting Update Request"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1392
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1393
+msgid "Meeting Reply"
+msgstr "د کتنې ځواب"
+
+#: ../calendar/gui/e-itip-control.c:1400
+#, c-format
+msgid "<b>%s</b> has canceled a meeting."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1401
+msgid "Meeting Cancelation"
+msgstr "د کتنې بندونه"
+
+#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1528
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1412
+msgid "Bad Meeting Message"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1439
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1440
+msgid "Task Information"
+msgstr "دنده خبرتياوې"
+
+#: ../calendar/gui/e-itip-control.c:1447
+#, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1449
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1450
+msgid "Task Proposal"
+msgstr ""
+
+#. FIXME Whats going on here?
+#: ../calendar/gui/e-itip-control.c:1456
+#, c-format
+msgid "<b>%s</b> wishes to be added to an existing task."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1457
+msgid "Task Update"
+msgstr "دنده اوسمهال"
+
+#: ../calendar/gui/e-itip-control.c:1461
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1462
+msgid "Task Update Request"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1469
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1470
+msgid "Task Reply"
+msgstr "د دندې ځواب"
+
+#: ../calendar/gui/e-itip-control.c:1477
+#, c-format
+msgid "<b>%s</b> has canceled a task."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1478
+msgid "Task Cancelation"
+msgstr "د دندې بندونه"
+
+#: ../calendar/gui/e-itip-control.c:1489
+msgid "Bad Task Message"
+msgstr "ناسم دنده استوزه"
+
+#: ../calendar/gui/e-itip-control.c:1513
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1514
+msgid "Free/Busy Information"
+msgstr "وزګار/بوخت خبرتياوې"
+
+#: ../calendar/gui/e-itip-control.c:1518
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1519
+msgid "Free/Busy Request"
+msgstr "وزګار/بوخت غوښتنه"
+
+#: ../calendar/gui/e-itip-control.c:1523
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1524
+msgid "Free/Busy Reply"
+msgstr "وزګار/بوخت ځواب"
+
+#: ../calendar/gui/e-itip-control.c:1529
+msgid "Bad Free/Busy Message"
+msgstr "ناسمه وزګار/بوخت استوزه"
+
+#: ../calendar/gui/e-itip-control.c:1605
+msgid "The message does not appear to be properly formed"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1664
+msgid "The message contains only unsupported requests."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1697
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1735
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1980
+msgid "Update complete\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2014
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2031
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2049
+msgid "Attendee status could not be updated because of an invalid status!\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2073
+msgid "Attendee status updated\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1254
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
+msgid "Item sent!\n"
+msgstr "!توکی ولېږل شو\n"
+
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
+msgid "The item could not be sent!\n"
+msgstr "توکی نه شي لېږلی!\n"
+
+#: ../calendar/gui/e-itip-control.c:2256
+msgid "Choose an action:"
+msgstr ":چار وټاکئ"
+
+#: ../calendar/gui/e-itip-control.c:2327
+msgid "Update"
+msgstr "اوسمهالول"
+
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:48
+msgid "Accept"
+msgstr "منل"
+
+#: ../calendar/gui/e-itip-control.c:2356
+msgid "Tentatively accept"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:50
+msgid "Decline"
+msgstr "نه منل"
+
+#: ../calendar/gui/e-itip-control.c:2386
+msgid "Send Free/Busy Information"
+msgstr "وزګار/بوخت خبرتياوې لېږل"
+
+#: ../calendar/gui/e-itip-control.c:2414
+msgid "Update respondent status"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2442
+msgid "Send Latest Information"
+msgstr "نوې خبرتياوې لېږل"
+
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
+#: ../ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "بندول"
+
+#: ../calendar/gui/e-itip-control.glade.h:1
+msgid "--to--"
+msgstr "--ته--"
+
+#: ../calendar/gui/e-itip-control.glade.h:2
+msgid "Calendar Message"
+msgstr "کليز استوزه"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
+msgid "Date:"
+msgstr ":نېټه"
+
+#: ../calendar/gui/e-itip-control.glade.h:5
+msgid "Loading Calendar"
+msgstr "کليز لېښل کيږي"
+
+#: ../calendar/gui/e-itip-control.glade.h:6
+msgid "Loading calendar..."
+msgstr "...کليز لېښل کيږي"
+
+#: ../calendar/gui/e-itip-control.glade.h:8
+msgid "Server Message:"
+msgstr ":پالنګر استوزه"
+
+#: ../calendar/gui/e-meeting-list-view.c:68
+msgid "Chair Persons"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:69
+msgid "Required Participants"
+msgstr "اړين ګډونوالان"
+
+#: ../calendar/gui/e-meeting-list-view.c:70
+msgid "Optional Participants"
+msgstr "غوراويز ګډونوالان"
+
+#: ../calendar/gui/e-meeting-list-view.c:71
+msgid "Resources"
+msgstr "سرچينې"
+
+#: ../calendar/gui/e-meeting-list-view.c:152
+msgid "Attendees"
+msgstr "ګډونوال"
+
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:965
+msgid "Individual"
+msgstr "وګړی"
+
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+msgid "Group"
+msgstr "ډله"
+
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:967
+msgid "Resource"
+msgstr "سرچينه"
+
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
+#: ../calendar/gui/print.c:968
+msgid "Room"
+msgstr "خونه"
+
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/print.c:982
+msgid "Chair"
+msgstr "څوکۍ"
+
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:983
+msgid "Required Participant"
+msgstr "اړين ګډونوال"
+
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:984
+msgid "Optional Participant"
+msgstr "غوراويز ګډونوال"
+
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/print.c:985
+msgid "Non-Participant"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:753
+msgid "Needs Action"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../calendar/gui/e-meeting-time-sel.c:397
+msgid "Tentative"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/itip-utils.c:673
+#: ../plugins/itip-formatter/itip-formatter.c:2044
+msgid "Delegated"
+msgstr ""
+
+#. The extra space is just a hack to occupy more space for Attendee
+#: ../calendar/gui/e-meeting-list-view.c:491
+msgid "Attendee                          "
+msgstr "ګډونوال"
+
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:533
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+msgid "In Process"
+msgstr "په بهير کې"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:473
+#: ../calendar/gui/e-meeting-time-sel.c:2122
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:2153
+msgid "%a %m/%d/%Y"
+msgstr "%a %m/%d/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:481
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
+#: ../calendar/gui/e-meeting-time-sel.c:399
+msgid "Out of Office"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:400
+msgid "No Information"
+msgstr "هېڅ خبرتياوې"
+
+#: ../calendar/gui/e-meeting-time-sel.c:415
+msgid "A_ttendees..."
+msgstr "...ګ_ډونوالان"
+
+#: ../calendar/gui/e-meeting-time-sel.c:436
+msgid "O_ptions"
+msgstr "غ_وراوي"
+
+#: ../calendar/gui/e-meeting-time-sel.c:453
+msgid "Show _only working hours"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:463
+msgid "Show _zoomed out"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:478
+msgid "_Update free/busy"
+msgstr "وزګار/بوخت اوسمهالول_"
+
+#: ../calendar/gui/e-meeting-time-sel.c:493
+msgid "_<<"
+msgstr "_<<"
+
+#: ../calendar/gui/e-meeting-time-sel.c:511
+msgid "_Autopick"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:526
+msgid ">_>"
+msgstr ">_>"
+
+#: ../calendar/gui/e-meeting-time-sel.c:543
+msgid "_All people and resources"
+msgstr "ټول وګړي او سرچينې_"
+
+#: ../calendar/gui/e-meeting-time-sel.c:552
+msgid "All _people and one resource"
+msgstr "ټول _وګړي او يوه سرچينه"
+
+#: ../calendar/gui/e-meeting-time-sel.c:561
+msgid "_Required people"
+msgstr "اړين وګړي_"
+
+#: ../calendar/gui/e-meeting-time-sel.c:570
+msgid "Required people and _one resource"
+msgstr "اړين وګړي او _يوه سرچينه"
+
+#: ../calendar/gui/e-meeting-time-sel.c:606
+msgid "_Start time:"
+msgstr ":پېل مهال_"
+
+#: ../calendar/gui/e-meeting-time-sel.c:633
+msgid "_End time:"
+msgstr ":پای مهال_"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "د ګډونوال زياتولو لپاره دلته کېکاږﺉ"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "ټولګړی نوم"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "ژبه"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "غړی"
+
+#: ../calendar/gui/e-memo-table.c:942
+msgid "_Delete Selected Memos"
+msgstr ""
+
+#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
+msgid "Click to add a memo"
+msgstr "د ميمو زياتولو لپاره کېکاږﺉ"
+
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/gnome-cal.c:2864
+#, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr ""
+
+#: ../calendar/gui/e-memos.c:809
+msgid "Loading memos"
+msgstr "ميموګانې لېښل کيږي"
+
+#: ../calendar/gui/e-memos.c:890
+#, c-format
+msgid "Opening memos at %s"
+msgstr ""
+
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+msgid "Deleting selected objects..."
+msgstr ""
+
+#: ../calendar/gui/e-tasks.c:963
+msgid "Loading tasks"
+msgstr "دندې لېښل کيږي"
+
+#: ../calendar/gui/e-tasks.c:1053
+#, c-format
+msgid "Opening tasks at %s"
+msgstr ""
+
+#: ../calendar/gui/e-tasks.c:1298
+msgid "Completing tasks..."
+msgstr "...دندې بشپړول کيږي"
+
+#: ../calendar/gui/e-tasks.c:1348
+msgid "Expunging"
+msgstr ""
+
+#: ../calendar/gui/e-timezone-entry.c:130
+msgid "Select Timezone"
+msgstr "مهال سيمه ټاکل"
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1637
+msgid "%d %B"
+msgstr "%d %B"
+
+#: ../calendar/gui/gnome-cal.c:830
+msgid "Updating query"
+msgstr "پوښتن اوسمهالول کيږي"
+
+#: ../calendar/gui/gnome-cal.c:2501
+msgid "_Custom View"
+msgstr "دوديز ليد_"
+
+#: ../calendar/gui/gnome-cal.c:2502
+msgid "_Save Custom View"
+msgstr "دوديز ليد ساتل_"
+
+#: ../calendar/gui/gnome-cal.c:2507
+msgid "_Define Views..."
+msgstr "...ليدنې پېژندل_"
+
+#: ../calendar/gui/gnome-cal.c:2688
+#, c-format
+msgid "Loading appointments at %s"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2707
+#, c-format
+msgid "Loading tasks at %s"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2716
+#, c-format
+msgid "Loading memos at %s"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2823
+#, c-format
+msgid "Opening %s"
+msgstr "پرانيستل کيږي %s"
+
+#: ../calendar/gui/gnome-cal.c:3779
+msgid "Purging"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:1
+msgid "April"
+msgstr "اپرېل"
+
+#: ../calendar/gui/goto-dialog.glade.h:2
+msgid "August"
+msgstr "اګېسټ"
+
+#: ../calendar/gui/goto-dialog.glade.h:3
+msgid "December"
+msgstr "ډېسمبر"
+
+#: ../calendar/gui/goto-dialog.glade.h:4
+msgid "February"
+msgstr "فېبروري"
+
+#: ../calendar/gui/goto-dialog.glade.h:5
+msgid "January"
+msgstr "جنوري"
+
+#: ../calendar/gui/goto-dialog.glade.h:6
+msgid "July"
+msgstr "جولای"
+
+#: ../calendar/gui/goto-dialog.glade.h:7
+msgid "June"
+msgstr "جون"
+
+#: ../calendar/gui/goto-dialog.glade.h:8
+msgid "March"
+msgstr "مارچ"
+
+#: ../calendar/gui/goto-dialog.glade.h:9
+msgid "May"
+msgstr "می"
+
+#: ../calendar/gui/goto-dialog.glade.h:10
+msgid "November"
+msgstr "نوېمبر"
+
+#: ../calendar/gui/goto-dialog.glade.h:11
+msgid "October"
+msgstr "اکټوبر"
+
+#: ../calendar/gui/goto-dialog.glade.h:12
+msgid "Select Date"
+msgstr "نېټه ټاکل"
+
+#: ../calendar/gui/goto-dialog.glade.h:13
+msgid "September"
+msgstr "سېپټمبر"
+
+#: ../calendar/gui/goto-dialog.glade.h:14
+msgid "_Select Today"
+msgstr "نن ټاکل_"
+
+#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../calendar/gui/itip-utils.c:544
+msgid "An organizer must be set."
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:448
+msgid "At least one attendee is necessary"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
+msgid "Event information"
+msgstr "پېښه خبرتياوې"
+
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
+msgid "Task information"
+msgstr "دنده خبرتياوې"
+
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+msgid "Memo information"
+msgstr "ميمو خبرتياوې"
+
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
+msgid "Free/Busy information"
+msgstr "وزګار/بوخت خبرتياوې"
+
+#: ../calendar/gui/itip-utils.c:634
+msgid "Calendar information"
+msgstr "کليز خبرتياوې"
+
+#: ../calendar/gui/itip-utils.c:683
+msgid "Updated"
+msgstr "اوسمهالېدلی"
+
+#: ../calendar/gui/itip-utils.c:691
+msgid "Refresh"
+msgstr "تاندول"
+
+#: ../calendar/gui/itip-utils.c:695
+msgid "Counter-proposal"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:762
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:770
+msgid "iCalendar information"
+msgstr "خبرتياوې iکليز د"
+
+#: ../calendar/gui/itip-utils.c:941
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:465
+msgid "_New Memo List"
+msgstr "نوی ميمو لړ_"
+
+#: ../calendar/gui/memos-component.c:545
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "ميمو %d"
+msgstr[1] "ميموګانې %d"
+
+#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "ټاکل شوی ‎%d ‎،"
+msgstr[1] "ټاکل شوي ‎%d ‎،"
+
+#: ../calendar/gui/memos-component.c:594
+msgid "Failed upgrading memos."
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:954
+#, c-format
+msgid "Unable to open the memo list '%s' for creating events and meetings"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:967
+msgid "There is no calendar available for creating memos"
+msgstr "د ميموګانو د جوړولو لپاره کوم کليز شتون نه لري"
+
+#: ../calendar/gui/memos-component.c:1077
+msgid "Memo Source Selector"
+msgstr "د ميمو سرچينه ټاکوونکی"
+
+#: ../calendar/gui/memos-component.c:1260
+msgid "New memo"
+msgstr "نوې ميمو"
+
+#: ../calendar/gui/memos-component.c:1261
+msgid "Mem_o"
+msgstr "ميم_و"
+
+#: ../calendar/gui/memos-component.c:1262
+msgid "Create a new memo"
+msgstr "نوې ميمو جوړول"
+
+#: ../calendar/gui/memos-component.c:1268
+msgid "New shared memo"
+msgstr "نوې ونډول شوې ميمو"
+
+#: ../calendar/gui/memos-component.c:1269
+msgid "_Shared memo"
+msgstr "ونډول شوې ميمو_"
+
+#: ../calendar/gui/memos-component.c:1270
+msgid "Create a shared new memo"
+msgstr "نوې ونډول شوې ميمو جوړول"
+
+#: ../calendar/gui/memos-component.c:1276
+msgid "New memo list"
+msgstr "نوی ميمو لړ"
+
+#: ../calendar/gui/memos-component.c:1277
+msgid "Memo li_st"
+msgstr "ميمو ل_ړ"
+
+#: ../calendar/gui/memos-component.c:1278
+msgid "Create a new memo list"
+msgstr "نوی ميمو لړ جوړول"
+
+#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
+msgid "Print Memos"
+msgstr "ميموګانې چاپول"
+
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days'"
+msgstr "راتلونکې ۷ ورځې"
+
+#: ../calendar/gui/migration.c:157
+msgid ""
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../calendar/gui/migration.c:161
+msgid ""
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#. FIXME: set proper domain/code
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#, c-format
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+
+#. FIXME: domain/code
+#: ../calendar/gui/migration.c:804
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr ""
+
+#. FIXME: domain/code
+#: ../calendar/gui/migration.c:972
+#, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr ""
+
+#: ../calendar/gui/migration.c:1227
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
+msgid "Notes"
+msgstr "يادښتونه"
+
+#: ../calendar/gui/print.c:515
+msgid "1st"
+msgstr "۱م"
+
+#: ../calendar/gui/print.c:515
+msgid "2nd"
+msgstr "۲م"
+
+#: ../calendar/gui/print.c:515
+msgid "3rd"
+msgstr "۳م"
+
+#: ../calendar/gui/print.c:515
+msgid "4th"
+msgstr "۴م"
+
+#: ../calendar/gui/print.c:515
+msgid "5th"
+msgstr "۵م"
+
+#: ../calendar/gui/print.c:516
+msgid "6th"
+msgstr "۶م"
+
+#: ../calendar/gui/print.c:516
+msgid "7th"
+msgstr "۷م"
+
+#: ../calendar/gui/print.c:516
+msgid "8th"
+msgstr "۸م"
+
+#: ../calendar/gui/print.c:516
+msgid "9th"
+msgstr "۹م"
+
+#: ../calendar/gui/print.c:516
+msgid "10th"
+msgstr "۱۰م"
+
+#: ../calendar/gui/print.c:517
+msgid "11th"
+msgstr "۱۱م"
+
+#: ../calendar/gui/print.c:517
+msgid "12th"
+msgstr "۱۲م"
+
+#: ../calendar/gui/print.c:517
+msgid "13th"
+msgstr "۱۳م"
+
+#: ../calendar/gui/print.c:517
+msgid "14th"
+msgstr "۱۴م"
+
+#: ../calendar/gui/print.c:517
+msgid "15th"
+msgstr "۱۵م"
+
+#: ../calendar/gui/print.c:518
+msgid "16th"
+msgstr "۱۶م"
+
+#: ../calendar/gui/print.c:518
+msgid "17th"
+msgstr "۱۷م"
+
+#: ../calendar/gui/print.c:518
+msgid "18th"
+msgstr "۱۸م"
+
+#: ../calendar/gui/print.c:518
+msgid "19th"
+msgstr "۱۹م"
+
+#: ../calendar/gui/print.c:518
+msgid "20th"
+msgstr "۲۰م"
+
+#: ../calendar/gui/print.c:519
+msgid "21st"
+msgstr "۲۱م"
+
+#: ../calendar/gui/print.c:519
+msgid "22nd"
+msgstr "۲۲م"
+
+#: ../calendar/gui/print.c:519
+msgid "23rd"
+msgstr "۲۳م"
+
+#: ../calendar/gui/print.c:519
+msgid "24th"
+msgstr "۲۴م"
+
+#: ../calendar/gui/print.c:519
+msgid "25th"
+msgstr "۲۵م"
+
+#: ../calendar/gui/print.c:520
+msgid "26th"
+msgstr "۲۶م"
+
+#: ../calendar/gui/print.c:520
+msgid "27th"
+msgstr "۲۷م"
+
+#: ../calendar/gui/print.c:520
+msgid "28th"
+msgstr "۲۸م"
+
+#: ../calendar/gui/print.c:520
+msgid "29th"
+msgstr "۲۹م"
+
+#: ../calendar/gui/print.c:520
+msgid "30th"
+msgstr "۳۰م"
+
+#: ../calendar/gui/print.c:521
+msgid "31st"
+msgstr "۳۱م"
+
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:596
+msgid "Su"
+msgstr "يوه نۍ"
+
+#: ../calendar/gui/print.c:596
+msgid "Mo"
+msgstr "دوه نۍ"
+
+#: ../calendar/gui/print.c:596
+msgid "Tu"
+msgstr "درې نۍ"
+
+#: ../calendar/gui/print.c:596
+msgid "We"
+msgstr "منځنۍ"
+
+#: ../calendar/gui/print.c:597
+msgid "Th"
+msgstr "پينځه نۍ"
+
+#: ../calendar/gui/print.c:597
+msgid "Fr"
+msgstr "جومه"
+
+#: ../calendar/gui/print.c:597
+msgid "Sa"
+msgstr "نۍ"
+
+#: ../calendar/gui/print.c:2444
+msgid "Appointment"
+msgstr "ټاکنه"
+
+#: ../calendar/gui/print.c:2446
+msgid "Task"
+msgstr "دنده"
+
+#: ../calendar/gui/print.c:2468
+#, c-format
+msgid "Summary: %s"
+msgstr "%s ‎:لڼديز"
+
+#: ../calendar/gui/print.c:2490
+msgid "Attendees: "
+msgstr ":ګډونوالان"
+
+#: ../calendar/gui/print.c:2530
+#, c-format
+msgid "Status: %s"
+msgstr "%s ‎:انکړ"
+
+#: ../calendar/gui/print.c:2547
+#, c-format
+msgid "Priority: %s"
+msgstr ""
+
+#: ../calendar/gui/print.c:2559
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "%i :سلنه بشپړ"
+
+#: ../calendar/gui/print.c:2571
+#, c-format
+msgid "URL: %s"
+msgstr "%s ‎:URL"
+
+#: ../calendar/gui/print.c:2584
+#, c-format
+msgid "Categories: %s"
+msgstr "%s :ټولۍ"
+
+#: ../calendar/gui/print.c:2595
+msgid "Contacts: "
+msgstr ":اړيکلوري"
+
+#. TODO Allow the user to customize the title.
+#: ../calendar/gui/print.c:2697
+msgid "Upcoming Appointments"
+msgstr "راتلونکې ټاکنې"
+
+#: ../calendar/gui/tasks-component.c:456
+msgid "_New Task List"
+msgstr "نوی دنده لړ_"
+
+#: ../calendar/gui/tasks-component.c:536
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "دنده %d"
+msgstr[1] "دندې %d"
+
+#: ../calendar/gui/tasks-component.c:585
+msgid "Failed upgrading tasks."
+msgstr ".د دندو پورجګونه پاتې راغله"
+
+#: ../calendar/gui/tasks-component.c:942
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:955
+msgid "There is no calendar available for creating tasks"
+msgstr "د دندو جوړولو لپاره کومه کليزه شتون نه لري"
+
+#: ../calendar/gui/tasks-component.c:1066
+msgid "Task Source Selector"
+msgstr "د دندې سرچينه ټاکونکی"
+
+#: ../calendar/gui/tasks-component.c:1325
+msgid "New task"
+msgstr "نوې دنده"
+
+#: ../calendar/gui/tasks-component.c:1327
+msgid "Create a new task"
+msgstr "نوې دنده جوړول"
+
+#: ../calendar/gui/tasks-component.c:1333
+msgid "New assigned task"
+msgstr "نوې ټاکلې دنده"
+
+#: ../calendar/gui/tasks-component.c:1334
+msgid "Assigne_d Task"
+msgstr "ټاکل_ې دنده"
+
+#: ../calendar/gui/tasks-component.c:1335
+msgid "Create a new assigned task"
+msgstr "نوې ټاکل شوې دنده جوړول"
+
+#: ../calendar/gui/tasks-component.c:1341
+msgid "New task list"
+msgstr "نوی دنده لړ"
+
+#: ../calendar/gui/tasks-component.c:1342
+msgid "Tas_k list"
+msgstr "دند_ه لړ"
+
+#: ../calendar/gui/tasks-component.c:1343
+msgid "Create a new task list"
+msgstr "نوی دنده لړ جوړول"
+
+#: ../calendar/gui/tasks-control.c:452
+msgid ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
+msgid "Do not ask me again."
+msgstr ".ما نه بيا مه پوښته"
+
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
+msgid "Print Tasks"
+msgstr "چاپ دندې"
+
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "بشپړ %"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "بند شوی"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "په پرمختګ کې"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "لوی د له"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "کوچنی دی له"
+
+#: ../calendar/importers/icalendar-importer.c:73
+msgid "Appointments and Meetings"
+msgstr "ټاکنې او کتنې"
+
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1578
+msgid "Opening calendar"
+msgstr "کليز پرانيستل کيږي"
+
+#: ../calendar/importers/icalendar-importer.c:438
+msgid "iCalendar files (.ics)"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:439
+msgid "Evolution iCalendar importer"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:515
+msgid "Reminder!"
+msgstr "!رايادوونی"
+
+#: ../calendar/importers/icalendar-importer.c:567
+msgid "vCalendar files (.vcf)"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:568
+msgid "Evolution vCalendar importer"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:730
+msgid "Calendar Events"
+msgstr "کليز پېښې"
+
+#: ../calendar/importers/icalendar-importer.c:767
+msgid "Evolution Calendar intelligent importer"
+msgstr ""
+
+#.
+#. * These are the timezone names from the Olson timezone data.
+#. * We only place them here so gettext picks them up for translation.
+#. * Don't include in any C files.
+#.
+#: ../calendar/zones.h:7
+msgid "Africa/Abidjan"
+msgstr "افريکا/ابېډجان"
+
+#: ../calendar/zones.h:8
+msgid "Africa/Accra"
+msgstr "افريکا/اکرا"
+
+#: ../calendar/zones.h:9
+msgid "Africa/Addis_Ababa"
+msgstr "افريکا/اډېس_ابابا"
+
+#: ../calendar/zones.h:10
+msgid "Africa/Algiers"
+msgstr "افريکا/الجيرز"
+
+#: ../calendar/zones.h:11
+msgid "Africa/Asmera"
+msgstr "افريکا/اسمېرا"
+
+#: ../calendar/zones.h:12
+msgid "Africa/Bamako"
+msgstr "افريکا/بماکو"
+
+#: ../calendar/zones.h:13
+msgid "Africa/Bangui"
+msgstr "افريکا/بنګوي"
+
+#: ../calendar/zones.h:14
+msgid "Africa/Banjul"
+msgstr "افريکا/بنجول"
+
+#: ../calendar/zones.h:15
+msgid "Africa/Bissau"
+msgstr "افريکا/بېساو"
+
+#: ../calendar/zones.h:16
+msgid "Africa/Blantyre"
+msgstr "افريکا/بلانټيري"
+
+#: ../calendar/zones.h:17
+msgid "Africa/Brazzaville"
+msgstr "افريکا/برېزاويلي"
+
+#: ../calendar/zones.h:18
+msgid "Africa/Bujumbura"
+msgstr "افريکا/بوجومبورا"
+
+#: ../calendar/zones.h:19
+msgid "Africa/Cairo"
+msgstr "افريکا/کاېره"
+
+#: ../calendar/zones.h:20
+msgid "Africa/Casablanca"
+msgstr "افريکا/کسبلنکا"
+
+#: ../calendar/zones.h:21
+msgid "Africa/Ceuta"
+msgstr "افريکا/سيوټا"
+
+#: ../calendar/zones.h:22
+msgid "Africa/Conakry"
+msgstr "افريکا/کوناکري"
+
+#: ../calendar/zones.h:23
+msgid "Africa/Dakar"
+msgstr "افريکا/ډاکر"
+
+#: ../calendar/zones.h:24
+msgid "Africa/Dar_es_Salaam"
+msgstr "افريکا/دار_السلام"
+
+#: ../calendar/zones.h:25
+msgid "Africa/Djibouti"
+msgstr "افريکا/ډجيبوټي"
+
+#: ../calendar/zones.h:26
+msgid "Africa/Douala"
+msgstr "افريکا/ډوالا"
+
+#: ../calendar/zones.h:27
+msgid "Africa/El_Aaiun"
+msgstr "افريکا/ال_ايون"
+
+#: ../calendar/zones.h:28
+msgid "Africa/Freetown"
+msgstr "افريکا/فريټاون"
+
+#: ../calendar/zones.h:29
+msgid "Africa/Gaborone"
+msgstr "افريکا/ګبوروني"
+
+#: ../calendar/zones.h:30
+msgid "Africa/Harare"
+msgstr "افريکا/هراري"
+
+#: ../calendar/zones.h:31
+msgid "Africa/Johannesburg"
+msgstr "افريکا/جوهنېسبرګ"
+
+#: ../calendar/zones.h:32
+msgid "Africa/Kampala"
+msgstr "افريکا/کمپالا"
+
+#: ../calendar/zones.h:33
+msgid "Africa/Khartoum"
+msgstr "افريکا/خرطوم"
+
+#: ../calendar/zones.h:34
+msgid "Africa/Kigali"
+msgstr "افريکا/کېګالي"
+
+#: ../calendar/zones.h:35
+msgid "Africa/Kinshasa"
+msgstr "افريکا/کېنشاسا"
+
+#: ../calendar/zones.h:36
+msgid "Africa/Lagos"
+msgstr "افريکا/لاګوس"
+
+#: ../calendar/zones.h:37
+msgid "Africa/Libreville"
+msgstr "افريکا/لېبرويلي"
+
+#: ../calendar/zones.h:38
+msgid "Africa/Lome"
+msgstr "افريکا/لومي"
+
+#: ../calendar/zones.h:39
+msgid "Africa/Luanda"
+msgstr "افريکا/لوانډا"
+
+#: ../calendar/zones.h:40
+msgid "Africa/Lubumbashi"
+msgstr "افريکا/لوبومبشي"
+
+#: ../calendar/zones.h:41
+msgid "Africa/Lusaka"
+msgstr "افريکا/لوساکا"
+
+#: ../calendar/zones.h:42
+msgid "Africa/Malabo"
+msgstr "افريکا/ملابو"
+
+#: ../calendar/zones.h:43
+msgid "Africa/Maputo"
+msgstr "افريکا/مپوټو"
+
+#: ../calendar/zones.h:44
+msgid "Africa/Maseru"
+msgstr "افريکا/مسيرو"
+
+#: ../calendar/zones.h:45
+msgid "Africa/Mbabane"
+msgstr "افريکا/مبباني"
+
+#: ../calendar/zones.h:46
+msgid "Africa/Mogadishu"
+msgstr "افريکا/موګاډېشو"
+
+#: ../calendar/zones.h:47
+msgid "Africa/Monrovia"
+msgstr "افريکا/مونرويا"
+
+#: ../calendar/zones.h:48
+msgid "Africa/Nairobi"
+msgstr "افريکا/نېروبي"
+
+#: ../calendar/zones.h:49
+msgid "Africa/Ndjamena"
+msgstr "افريکا/نجامينا"
+
+#: ../calendar/zones.h:50
+msgid "Africa/Niamey"
+msgstr "افريکا/نيامي"
+
+#: ../calendar/zones.h:51
+msgid "Africa/Nouakchott"
+msgstr "افريکا/نوېکچوټ"
+
+#: ../calendar/zones.h:52
+msgid "Africa/Ouagadougou"
+msgstr ""
+
+#: ../calendar/zones.h:53
+msgid "Africa/Porto-Novo"
+msgstr "افريکا/پورټو-نوو"
+
+#: ../calendar/zones.h:54
+msgid "Africa/Sao_Tome"
+msgstr "افريکا/ساو_ټومي"
+
+#: ../calendar/zones.h:55
+msgid "Africa/Timbuktu"
+msgstr "افريکا/ټېمبوکټو"
+
+#: ../calendar/zones.h:56
+msgid "Africa/Tripoli"
+msgstr "افريکا/ټريپولي"
+
+#: ../calendar/zones.h:57
+msgid "Africa/Tunis"
+msgstr "افريکا/ټونېس"
+
+#: ../calendar/zones.h:58
+msgid "Africa/Windhoek"
+msgstr "افريکا/وېنډهاک"
+
+#: ../calendar/zones.h:59
+msgid "America/Adak"
+msgstr "افريکا/اډېک"
+
+#: ../calendar/zones.h:60
+msgid "America/Anchorage"
+msgstr ""
+
+#: ../calendar/zones.h:61
+msgid "America/Anguilla"
+msgstr "امريکا/انګوېلا"
+
+#: ../calendar/zones.h:62
+msgid "America/Antigua"
+msgstr "امريکا/انټېګوا"
+
+#: ../calendar/zones.h:63
+msgid "America/Araguaina"
+msgstr "امريکا/اراګوينا"
+
+#: ../calendar/zones.h:64
+msgid "America/Aruba"
+msgstr "امريکا/اروبا"
+
+#: ../calendar/zones.h:65
+msgid "America/Asuncion"
+msgstr "امريکا/اسنشين"
+
+#: ../calendar/zones.h:66
+msgid "America/Barbados"
+msgstr "امريکا/برباډوس"
+
+#: ../calendar/zones.h:67
+msgid "America/Belem"
+msgstr "امريکا/بېلېم"
+
+#: ../calendar/zones.h:68
+msgid "America/Belize"
+msgstr "امريکا/بېلاېز"
+
+#: ../calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr "امريکا/بوا_وېسټا"
+
+#: ../calendar/zones.h:70
+msgid "America/Bogota"
+msgstr "امريکا/بوګوټا"
+
+#: ../calendar/zones.h:71
+msgid "America/Boise"
+msgstr "امريکا/بويس"
+
+#: ../calendar/zones.h:72
+msgid "America/Buenos_Aires"
+msgstr "امريکا/بوېنوس_ايرز"
+
+#: ../calendar/zones.h:73
+msgid "America/Cambridge_Bay"
+msgstr "امريکا/کېمبرېج_بی"
+
+#: ../calendar/zones.h:74
+msgid "America/Cancun"
+msgstr "امريکا/کېنکن"
+
+#: ../calendar/zones.h:75
+msgid "America/Caracas"
+msgstr "امريکا/کراکس"
+
+#: ../calendar/zones.h:76
+msgid "America/Catamarca"
+msgstr "امريکا/کېټېمرکا"
+
+#: ../calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr "امريکا/کايني"
+
+#: ../calendar/zones.h:78
+msgid "America/Cayman"
+msgstr "امريکا/کېمېن"
+
+#: ../calendar/zones.h:79
+msgid "America/Chicago"
+msgstr "امريکا/شېکاګو"
+
+#: ../calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr "امريکا/چېهواهوا"
+
+#: ../calendar/zones.h:81
+msgid "America/Cordoba"
+msgstr "امريکا/کورډوبا"
+
+#: ../calendar/zones.h:82
+msgid "America/Costa_Rica"
+msgstr "امريکا/کوسټا_ريکا"
+
+#: ../calendar/zones.h:83
+msgid "America/Cuiaba"
+msgstr "امريکا/کويابا"
+
+#: ../calendar/zones.h:84
+msgid "America/Curacao"
+msgstr "امريکا/کورېکاو"
+
+#: ../calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr "امريکا/ډنمارکشاون"
+
+#: ../calendar/zones.h:86
+msgid "America/Dawson"
+msgstr "امريکا/ډاوسن"
+
+#: ../calendar/zones.h:87
+msgid "America/Dawson_Creek"
+msgstr "امريکا/ډاوسن_کريک"
+
+#: ../calendar/zones.h:88
+msgid "America/Denver"
+msgstr "امريکا/ډېنوير"
+
+#: ../calendar/zones.h:89
+msgid "America/Detroit"
+msgstr "امريکا/ډېټروېټ"
+
+#: ../calendar/zones.h:90
+msgid "America/Dominica"
+msgstr "امريکا/ډومېنېکا"
+
+#: ../calendar/zones.h:91
+msgid "America/Edmonton"
+msgstr "امريکا/اېډمونټن"
+
+#: ../calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: ../calendar/zones.h:93
+msgid "America/El_Salvador"
+msgstr "امريکا/ال_سلوېډر"
+
+#: ../calendar/zones.h:94
+msgid "America/Fortaleza"
+msgstr "امريکا/فورټاليزا"
+
+#: ../calendar/zones.h:95
+msgid "America/Glace_Bay"
+msgstr "امريکا/ګلېس_بی"
+
+#: ../calendar/zones.h:96
+msgid "America/Godthab"
+msgstr ""
+
+#: ../calendar/zones.h:97
+msgid "America/Goose_Bay"
+msgstr "امريکا/ګوس_بی"
+
+#: ../calendar/zones.h:98
+msgid "America/Grand_Turk"
+msgstr "امريکا/ګرېنډ_ټرک"
+
+#: ../calendar/zones.h:99
+msgid "America/Grenada"
+msgstr "امريکا/ګرينېډا"
+
+#: ../calendar/zones.h:100
+msgid "America/Guadeloupe"
+msgstr ""
+
+#: ../calendar/zones.h:101
+msgid "America/Guatemala"
+msgstr "امريکا/ګواټيمالا"
+
+#: ../calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr "امريکا/ګواياکېل"
+
+#: ../calendar/zones.h:103
+msgid "America/Guyana"
+msgstr "امريکا/ګويانا"
+
+#: ../calendar/zones.h:104
+msgid "America/Halifax"
+msgstr "امريکا/هلېفېکس"
+
+#: ../calendar/zones.h:105
+msgid "America/Havana"
+msgstr "امريکا/هوانا"
+
+#: ../calendar/zones.h:106
+msgid "America/Hermosillo"
+msgstr "امريکا/هرموسېلو"
+
+#: ../calendar/zones.h:107
+msgid "America/Indiana/Indianapolis"
+msgstr "امريکا/انډيانا/انډياناپولېس"
+
+#: ../calendar/zones.h:108
+msgid "America/Indiana/Knox"
+msgstr "امريکا/انډيانا/ناکس"
+
+#: ../calendar/zones.h:109
+msgid "America/Indiana/Marengo"
+msgstr "امريکا/انډيانا/مېرېنګو"
+
+#: ../calendar/zones.h:110
+msgid "America/Indiana/Vevay"
+msgstr "امريکا/انډيانا/وېوی"
+
+#: ../calendar/zones.h:111
+msgid "America/Indianapolis"
+msgstr "امريکا/انډياناپولېس"
+
+#: ../calendar/zones.h:112
+msgid "America/Inuvik"
+msgstr "امريکا/اېنوېک"
+
+#: ../calendar/zones.h:113
+msgid "America/Iqaluit"
+msgstr ""
+
+#: ../calendar/zones.h:114
+msgid "America/Jamaica"
+msgstr "امريکا/جماېکا"
+
+#: ../calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr "امريکا/جوجوي"
+
+#: ../calendar/zones.h:116
+msgid "America/Juneau"
+msgstr ""
+
+#: ../calendar/zones.h:117
+msgid "America/Kentucky/Louisville"
+msgstr ""
+
+#: ../calendar/zones.h:118
+msgid "America/Kentucky/Monticello"
+msgstr ""
+
+#: ../calendar/zones.h:119
+msgid "America/La_Paz"
+msgstr "امريکا/لې_پز"
+
+#: ../calendar/zones.h:120
+msgid "America/Lima"
+msgstr "امريکا/ليما"
+
+#: ../calendar/zones.h:121
+msgid "America/Los_Angeles"
+msgstr "امريکا/لاس_انجېلس"
+
+#: ../calendar/zones.h:122
+msgid "America/Louisville"
+msgstr ""
+
+#: ../calendar/zones.h:123
+msgid "America/Maceio"
+msgstr "امريکا/مېشيو"
+
+#: ../calendar/zones.h:124
+msgid "America/Managua"
+msgstr "امريکا/مناګوا"
+
+#: ../calendar/zones.h:125
+msgid "America/Manaus"
+msgstr "امريکا/مناوس"
+
+#: ../calendar/zones.h:126
+msgid "America/Martinique"
+msgstr "امريکا/مارټېنېک"
+
+#: ../calendar/zones.h:127
+msgid "America/Mazatlan"
+msgstr "امريکا/مزېټلېن"
+
+#: ../calendar/zones.h:128
+msgid "America/Mendoza"
+msgstr "امريکا/مېنډوزا"
+
+#: ../calendar/zones.h:129
+msgid "America/Menominee"
+msgstr ""
+
+#: ../calendar/zones.h:130
+msgid "America/Merida"
+msgstr "امريکا/مېرېډا"
+
+#: ../calendar/zones.h:131
+msgid "America/Mexico_City"
+msgstr "امريکا/مېکسيکا_ښار"
+
+#: ../calendar/zones.h:132
+msgid "America/Miquelon"
+msgstr "امريکا/مېکوېلېن"
+
+#: ../calendar/zones.h:133
+msgid "America/Monterrey"
+msgstr "امريکا/مونټيري"
+
+#: ../calendar/zones.h:134
+msgid "America/Montevideo"
+msgstr ""
+
+#: ../calendar/zones.h:135
+msgid "America/Montreal"
+msgstr "امريکا/مونټريل"
+
+#: ../calendar/zones.h:136
+msgid "America/Montserrat"
+msgstr "امريکا/مونټسېرټ"
+
+#: ../calendar/zones.h:137
+msgid "America/Nassau"
+msgstr "امريکا/ناساو"
+
+#: ../calendar/zones.h:138
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "America/New_York"
+msgstr "امريکا/نيو_يارک"
+
+#: ../calendar/zones.h:139
+msgid "America/Nipigon"
+msgstr "امريکا/نېپېګن"
+
+#: ../calendar/zones.h:140
+msgid "America/Nome"
+msgstr "امريکا/نومي"
+
+#: ../calendar/zones.h:141
+msgid "America/Noronha"
+msgstr "امريکا/نورونها"
+
+#: ../calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: ../calendar/zones.h:143
+msgid "America/Panama"
+msgstr "امريکا/پېناما"
+
+#: ../calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: ../calendar/zones.h:145
+msgid "America/Paramaribo"
+msgstr "امريکا/پېراماريبو"
+
+#: ../calendar/zones.h:146
+msgid "America/Phoenix"
+msgstr "امريکا/فوېنېکس"
+
+#: ../calendar/zones.h:147
+msgid "America/Port-au-Prince"
+msgstr ""
+
+#: ../calendar/zones.h:148
+msgid "America/Port_of_Spain"
+msgstr ""
+
+#: ../calendar/zones.h:149
+msgid "America/Porto_Velho"
+msgstr ""
+
+#: ../calendar/zones.h:150
+msgid "America/Puerto_Rico"
+msgstr ""
+
+#: ../calendar/zones.h:151
+msgid "America/Rainy_River"
+msgstr ""
+
+#: ../calendar/zones.h:152
+msgid "America/Rankin_Inlet"
+msgstr ""
+
+#: ../calendar/zones.h:153
+msgid "America/Recife"
+msgstr "امريکا/ريساېف"
+
+#: ../calendar/zones.h:154
+msgid "America/Regina"
+msgstr "امريکا/رېجينا"
+
+#: ../calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr "امريکا/ريو_برېنکو"
+
+#: ../calendar/zones.h:156
+msgid "America/Rosario"
+msgstr "امريکا/روسېريو"
+
+#: ../calendar/zones.h:157
+msgid "America/Santiago"
+msgstr "امريکا/سنټياګو"
+
+#: ../calendar/zones.h:158
+msgid "America/Santo_Domingo"
+msgstr ""
+
+#: ../calendar/zones.h:159
+msgid "America/Sao_Paulo"
+msgstr "امريکا/ساو_پاولو"
+
+#: ../calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: ../calendar/zones.h:161
+msgid "America/Shiprock"
+msgstr "امريکا/شېپراک"
+
+#: ../calendar/zones.h:162
+msgid "America/St_Johns"
+msgstr "امريکا/سېنټ_جونز"
+
+#: ../calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr "امريکا/سېنټ_کېټس"
+
+#: ../calendar/zones.h:164
+msgid "America/St_Lucia"
+msgstr "امريکا/سېنټ_لشيا"
+
+#: ../calendar/zones.h:165
+msgid "America/St_Thomas"
+msgstr "امريکا/سېنټ_ټامس"
+
+#: ../calendar/zones.h:166
+msgid "America/St_Vincent"
+msgstr "امريکا/سېنټ_وېنسېنټ"
+
+#: ../calendar/zones.h:167
+msgid "America/Swift_Current"
+msgstr "امريکا/سوېفټ_کرېنټ"
+
+#: ../calendar/zones.h:168
+msgid "America/Tegucigalpa"
+msgstr ""
+
+#: ../calendar/zones.h:169
+msgid "America/Thule"
+msgstr "امريکا/ټولي"
+
+#: ../calendar/zones.h:170
+msgid "America/Thunder_Bay"
+msgstr "امريکا/ټنډر_بی"
+
+#: ../calendar/zones.h:171
+msgid "America/Tijuana"
+msgstr "امريکا/ټېجوانا"
+
+#: ../calendar/zones.h:172
+msgid "America/Tortola"
+msgstr "امريکا/ټورټولا"
+
+#: ../calendar/zones.h:173
+msgid "America/Vancouver"
+msgstr ""
+
+#: ../calendar/zones.h:174
+msgid "America/Whitehorse"
+msgstr "امريکا/واېټهارس"
+
+#: ../calendar/zones.h:175
+msgid "America/Winnipeg"
+msgstr "امريکا/وېنېپېګ"
+
+#: ../calendar/zones.h:176
+msgid "America/Yakutat"
+msgstr "امريکا/ياکوټېټ"
+
+#: ../calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+#: ../calendar/zones.h:178
+msgid "Antarctica/Casey"
+msgstr ""
+
+#: ../calendar/zones.h:179
+msgid "Antarctica/Davis"
+msgstr ""
+
+#: ../calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: ../calendar/zones.h:181
+msgid "Antarctica/Mawson"
+msgstr ""
+
+#: ../calendar/zones.h:182
+msgid "Antarctica/McMurdo"
+msgstr ""
+
+#: ../calendar/zones.h:183
+msgid "Antarctica/Palmer"
+msgstr ""
+
+#: ../calendar/zones.h:184
+msgid "Antarctica/South_Pole"
+msgstr ""
+
+#: ../calendar/zones.h:185
+msgid "Antarctica/Syowa"
+msgstr ""
+
+#: ../calendar/zones.h:186
+msgid "Antarctica/Vostok"
+msgstr ""
+
+#: ../calendar/zones.h:187
+msgid "Arctic/Longyearbyen"
+msgstr ""
+
+#: ../calendar/zones.h:188
+msgid "Asia/Aden"
+msgstr "اېشيا/اډېن"
+
+#: ../calendar/zones.h:189
+msgid "Asia/Almaty"
+msgstr "اېشيا/المټي"
+
+#: ../calendar/zones.h:190
+msgid "Asia/Amman"
+msgstr "اېشيا/امن"
+
+#: ../calendar/zones.h:191
+msgid "Asia/Anadyr"
+msgstr "اېشيا/اناډېر"
+
+#: ../calendar/zones.h:192
+msgid "Asia/Aqtau"
+msgstr "اېشيا/اکټاو"
+
+#: ../calendar/zones.h:193
+msgid "Asia/Aqtobe"
+msgstr "اېشيا/اکټوبي"
+
+#: ../calendar/zones.h:194
+msgid "Asia/Ashgabat"
+msgstr "اېشيا/اشګبت"
+
+#: ../calendar/zones.h:195
+msgid "Asia/Baghdad"
+msgstr "اېشيا/بغداد"
+
+#: ../calendar/zones.h:196
+msgid "Asia/Bahrain"
+msgstr "اېشيا/بحرېن"
+
+#: ../calendar/zones.h:197
+msgid "Asia/Baku"
+msgstr "اېشيا/باکو"
+
+#: ../calendar/zones.h:198
+msgid "Asia/Bangkok"
+msgstr "اېشيا/بېنګکاک"
+
+#: ../calendar/zones.h:199
+msgid "Asia/Beirut"
+msgstr "اېشيا/بيروت"
+
+#: ../calendar/zones.h:200
+msgid "Asia/Bishkek"
+msgstr "اېشيا/بېشکېک"
+
+#: ../calendar/zones.h:201
+msgid "Asia/Brunei"
+msgstr "اېشيا/بروني"
+
+#: ../calendar/zones.h:202
+msgid "Asia/Calcutta"
+msgstr "اېشيا/کولکته"
+
+#: ../calendar/zones.h:203
+msgid "Asia/Choibalsan"
+msgstr "اېشيا/چوېبلسن"
+
+#: ../calendar/zones.h:204
+msgid "Asia/Chongqing"
+msgstr "اېشيا/چونګکېنګ"
+
+#: ../calendar/zones.h:205
+msgid "Asia/Colombo"
+msgstr "اېشيا/کولمبو"
+
+#: ../calendar/zones.h:206
+msgid "Asia/Damascus"
+msgstr "اېشيا/ډماسکس"
+
+#: ../calendar/zones.h:207
+msgid "Asia/Dhaka"
+msgstr "اېشيا/ډهاکه"
+
+#: ../calendar/zones.h:208
+msgid "Asia/Dili"
+msgstr "اېشيا/ډيلي"
+
+#: ../calendar/zones.h:209
+msgid "Asia/Dubai"
+msgstr "اېشيا/دوبۍ"
+
+#: ../calendar/zones.h:210
+msgid "Asia/Dushanbe"
+msgstr "اېشيا/دوشنبې"
+
+#: ../calendar/zones.h:211
+msgid "Asia/Gaza"
+msgstr "اېشيا/غزا"
+
+#: ../calendar/zones.h:212
+msgid "Asia/Harbin"
+msgstr "اېشيا/هربېن"
+
+#: ../calendar/zones.h:213
+msgid "Asia/Hong_Kong"
+msgstr "اېشيا/هانګ_کانګ"
+
+#: ../calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr "اېشيا/هووډ"
+
+#: ../calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr "اېشيا/اېرکوټسک"
+
+#: ../calendar/zones.h:216
+msgid "Asia/Istanbul"
+msgstr "اېشيا/استانبول"
+
+#: ../calendar/zones.h:217
+msgid "Asia/Jakarta"
+msgstr "اېشيا/جکرتا"
+
+#: ../calendar/zones.h:218
+msgid "Asia/Jayapura"
+msgstr "اېشيا/جېاپوره"
+
+#: ../calendar/zones.h:219
+msgid "Asia/Jerusalem"
+msgstr "اېشيا/جېروسلم"
+
+#: ../calendar/zones.h:220
+msgid "Asia/Kabul"
+msgstr "اېشيا/کابل"
+
+#: ../calendar/zones.h:221
+msgid "Asia/Kamchatka"
+msgstr "اېشيا/کمچټکا"
+
+#: ../calendar/zones.h:222
+msgid "Asia/Karachi"
+msgstr "اېشيا/کراچۍ"
+
+#: ../calendar/zones.h:223
+msgid "Asia/Kashgar"
+msgstr "اېشيا/کشګر"
+
+#: ../calendar/zones.h:224
+msgid "Asia/Katmandu"
+msgstr "اېشا/کېټمانډو"
+
+#: ../calendar/zones.h:225
+msgid "Asia/Krasnoyarsk"
+msgstr ""
+
+#: ../calendar/zones.h:226
+msgid "Asia/Kuala_Lumpur"
+msgstr "اېشيا/کوالا_لمپور"
+
+#: ../calendar/zones.h:227
+msgid "Asia/Kuching"
+msgstr "اېشيا/کوچينګ"
+
+#: ../calendar/zones.h:228
+msgid "Asia/Kuwait"
+msgstr "اېشيا/کوېټ"
+
+#: ../calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr "اېشيا/مکاو"
+
+#: ../calendar/zones.h:230
+msgid "Asia/Macau"
+msgstr "اېشيا/مکاو"
+
+#: ../calendar/zones.h:231
+msgid "Asia/Magadan"
+msgstr "اېشيا/مګډن"
+
+#: ../calendar/zones.h:232
+msgid "Asia/Makassar"
+msgstr "اېشيا/مکسسر"
+
+#: ../calendar/zones.h:233
+msgid "Asia/Manila"
+msgstr "اېشيا/منيلا"
+
+#: ../calendar/zones.h:234
+msgid "Asia/Muscat"
+msgstr "اېشيا/موسکټ"
+
+#: ../calendar/zones.h:235
+msgid "Asia/Nicosia"
+msgstr "اېشيا/نېکوشيا"
+
+#: ../calendar/zones.h:236
+msgid "Asia/Novosibirsk"
+msgstr "اېشيا/نووسېبرسک"
+
+#: ../calendar/zones.h:237
+msgid "Asia/Omsk"
+msgstr "اېشيا/ومسک"
+
+#: ../calendar/zones.h:238
+msgid "Asia/Oral"
+msgstr "اېشيا/اورال"
+
+#: ../calendar/zones.h:239
+msgid "Asia/Phnom_Penh"
+msgstr "اېشيا/پهنوم_پېنه"
+
+#: ../calendar/zones.h:240
+msgid "Asia/Pontianak"
+msgstr "اېشيا/پونټيانک"
+
+#: ../calendar/zones.h:241
+msgid "Asia/Pyongyang"
+msgstr "اېشيا/پيانګيانګ"
+
+#: ../calendar/zones.h:242
+msgid "Asia/Qatar"
+msgstr "اېشيا/قطر"
+
+#: ../calendar/zones.h:243
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: ../calendar/zones.h:244
+msgid "Asia/Rangoon"
+msgstr "اېشيا/رنګون"
+
+#: ../calendar/zones.h:245
+msgid "Asia/Riyadh"
+msgstr "اېشيا/رياض"
+
+#: ../calendar/zones.h:246
+msgid "Asia/Saigon"
+msgstr "اېشيا/ساېګون"
+
+#: ../calendar/zones.h:247
+msgid "Asia/Sakhalin"
+msgstr "اېشيا/سکالين"
+
+#: ../calendar/zones.h:248
+msgid "Asia/Samarkand"
+msgstr "اېشيا/سمرکند"
+
+#: ../calendar/zones.h:249
+msgid "Asia/Seoul"
+msgstr "اېشيا/سېول"
+
+#: ../calendar/zones.h:250
+msgid "Asia/Shanghai"
+msgstr "اېشيا/شنګهای"
+
+#: ../calendar/zones.h:251
+msgid "Asia/Singapore"
+msgstr "اېشيا/سنګاپور"
+
+#: ../calendar/zones.h:252
+msgid "Asia/Taipei"
+msgstr "اېشيا/ټاېپي"
+
+#: ../calendar/zones.h:253
+msgid "Asia/Tashkent"
+msgstr "اېشيا/ټاشکنټ"
+
+#: ../calendar/zones.h:254
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: ../calendar/zones.h:255
+msgid "Asia/Tehran"
+msgstr "اېشيا/تهران"
+
+#: ../calendar/zones.h:256
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: ../calendar/zones.h:257
+msgid "Asia/Tokyo"
+msgstr "اېشيا/ټوکيو"
+
+#: ../calendar/zones.h:258
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: ../calendar/zones.h:259
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: ../calendar/zones.h:260
+msgid "Asia/Urumqi"
+msgstr "اېشيا/اورمچي"
+
+#: ../calendar/zones.h:261
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: ../calendar/zones.h:262
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: ../calendar/zones.h:263
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: ../calendar/zones.h:264
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: ../calendar/zones.h:265
+msgid "Asia/Yerevan"
+msgstr "اېشيا/اېرېوان"
+
+#: ../calendar/zones.h:266
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: ../calendar/zones.h:267
+msgid "Atlantic/Bermuda"
+msgstr ""
+
+#: ../calendar/zones.h:268
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: ../calendar/zones.h:269
+msgid "Atlantic/Cape_Verde"
+msgstr ""
+
+#: ../calendar/zones.h:270
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: ../calendar/zones.h:271
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: ../calendar/zones.h:272
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: ../calendar/zones.h:273
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: ../calendar/zones.h:274
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: ../calendar/zones.h:275
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: ../calendar/zones.h:276
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: ../calendar/zones.h:277
+msgid "Australia/Adelaide"
+msgstr ""
+
+#: ../calendar/zones.h:278
+msgid "Australia/Brisbane"
+msgstr ""
+
+#: ../calendar/zones.h:279
+msgid "Australia/Broken_Hill"
+msgstr ""
+
+#: ../calendar/zones.h:280
+msgid "Australia/Darwin"
+msgstr ""
+
+#: ../calendar/zones.h:281
+msgid "Australia/Hobart"
+msgstr ""
+
+#: ../calendar/zones.h:282
+msgid "Australia/Lindeman"
+msgstr ""
+
+#: ../calendar/zones.h:283
+msgid "Australia/Lord_Howe"
+msgstr ""
+
+#: ../calendar/zones.h:284
+msgid "Australia/Melbourne"
+msgstr ""
+
+#: ../calendar/zones.h:285
+msgid "Australia/Perth"
+msgstr "اسټريليا/پېرټ"
+
+#: ../calendar/zones.h:286
+msgid "Australia/Sydney"
+msgstr "اسټريليا/سېډني"
+
+#: ../calendar/zones.h:287
+msgid "Europe/Amsterdam"
+msgstr "يورپ/اېمسټرډېم"
+
+#: ../calendar/zones.h:288
+msgid "Europe/Andorra"
+msgstr "يورپ/انډورا"
+
+#: ../calendar/zones.h:289
+msgid "Europe/Athens"
+msgstr "يورپ/اتېنز"
+
+#: ../calendar/zones.h:290
+msgid "Europe/Belfast"
+msgstr "يورپ/بېلفاسټ"
+
+#: ../calendar/zones.h:291
+msgid "Europe/Belgrade"
+msgstr "يورپ/بېلګرېډ"
+
+#: ../calendar/zones.h:292
+msgid "Europe/Berlin"
+msgstr "يورپ/برلېن"
+
+#: ../calendar/zones.h:293
+msgid "Europe/Bratislava"
+msgstr "يورپ/برېټسلېوا"
+
+#: ../calendar/zones.h:294
+msgid "Europe/Brussels"
+msgstr "يورپ/بروسېلز"
+
+#: ../calendar/zones.h:295
+msgid "Europe/Bucharest"
+msgstr "يورپ/بکارسټ"
+
+#: ../calendar/zones.h:296
+msgid "Europe/Budapest"
+msgstr "يورپ/بوډېپېسټ"
+
+#: ../calendar/zones.h:297
+msgid "Europe/Chisinau"
+msgstr "يورپ/چېسېناو"
+
+#: ../calendar/zones.h:298
+msgid "Europe/Copenhagen"
+msgstr "يورپ/کوپېنهېګن"
+
+#: ../calendar/zones.h:299
+msgid "Europe/Dublin"
+msgstr "يورپ/ډبلېن"
+
+#: ../calendar/zones.h:300
+msgid "Europe/Gibraltar"
+msgstr "يورپ/جېبرلټر"
+
+#: ../calendar/zones.h:301
+msgid "Europe/Helsinki"
+msgstr "يورپ/هېلسينکي"
+
+#: ../calendar/zones.h:302
+msgid "Europe/Istanbul"
+msgstr "يورپ/استانبول"
+
+#: ../calendar/zones.h:303
+msgid "Europe/Kaliningrad"
+msgstr "يورپ/کېلېنېنګرېډ"
+
+#: ../calendar/zones.h:304
+msgid "Europe/Kiev"
+msgstr "يورپ/کيو"
+
+#: ../calendar/zones.h:305
+msgid "Europe/Lisbon"
+msgstr "يورپ/لېسبن"
+
+#: ../calendar/zones.h:306
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: ../calendar/zones.h:307
+msgid "Europe/London"
+msgstr "يورپ/لڼدن"
+
+#: ../calendar/zones.h:308
+msgid "Europe/Luxembourg"
+msgstr "يورپ/لګسېمبرګ"
+
+#: ../calendar/zones.h:309
+msgid "Europe/Madrid"
+msgstr "يورپ/مېډرېډ"
+
+#: ../calendar/zones.h:310
+msgid "Europe/Malta"
+msgstr "يورپ/مالټا"
+
+#: ../calendar/zones.h:311
+msgid "Europe/Minsk"
+msgstr "يورپ/مېنسک"
+
+#: ../calendar/zones.h:312
+msgid "Europe/Monaco"
+msgstr "يورپ/موناکو"
+
+#: ../calendar/zones.h:313
+msgid "Europe/Moscow"
+msgstr "يورپ/مسکاو"
+
+#: ../calendar/zones.h:314
+msgid "Europe/Nicosia"
+msgstr "يورپ/نېکوشيا"
+
+#: ../calendar/zones.h:315
+msgid "Europe/Oslo"
+msgstr "يورپ/وسلو"
+
+#: ../calendar/zones.h:316
+msgid "Europe/Paris"
+msgstr "يورپ/پاريس"
+
+#: ../calendar/zones.h:317
+msgid "Europe/Prague"
+msgstr "يورپ/پراګ"
+
+#: ../calendar/zones.h:318
+msgid "Europe/Riga"
+msgstr "يورپ/رېګا"
+
+#: ../calendar/zones.h:319
+msgid "Europe/Rome"
+msgstr "يورپ/روم"
+
+#: ../calendar/zones.h:320
+msgid "Europe/Samara"
+msgstr "يورپ/سمارا"
+
+#: ../calendar/zones.h:321
+msgid "Europe/San_Marino"
+msgstr "يورپ/سن_مارينو"
+
+#: ../calendar/zones.h:322
+msgid "Europe/Sarajevo"
+msgstr "يورپ/سراجيوو"
+
+#: ../calendar/zones.h:323
+msgid "Europe/Simferopol"
+msgstr "يورپ/سېمفېروپول"
+
+#: ../calendar/zones.h:324
+msgid "Europe/Skopje"
+msgstr "يورپ/سکوپجي"
+
+#: ../calendar/zones.h:325
+msgid "Europe/Sofia"
+msgstr "يورپ/سوفيه"
+
+#: ../calendar/zones.h:326
+msgid "Europe/Stockholm"
+msgstr "يورپ/سټاکهولم"
+
+#: ../calendar/zones.h:327
+msgid "Europe/Tallinn"
+msgstr "يورپ/ټېلېن"
+
+#: ../calendar/zones.h:328
+msgid "Europe/Tirane"
+msgstr "يورپ/ټېراني"
+
+#: ../calendar/zones.h:329
+msgid "Europe/Uzhgorod"
+msgstr "يورپ/وزګورود"
+
+#: ../calendar/zones.h:330
+msgid "Europe/Vaduz"
+msgstr "يورپ/وېډوز"
+
+#: ../calendar/zones.h:331
+msgid "Europe/Vatican"
+msgstr "يورپ/وېټېکن"
+
+#: ../calendar/zones.h:332
+msgid "Europe/Vienna"
+msgstr "يورپ/وينا"
+
+#: ../calendar/zones.h:333
+msgid "Europe/Vilnius"
+msgstr "يورپ/وېلنيس"
+
+#: ../calendar/zones.h:334
+msgid "Europe/Warsaw"
+msgstr "يورپ/وارسا"
+
+#: ../calendar/zones.h:335
+msgid "Europe/Zagreb"
+msgstr "يورپ/زېګرېب"
+
+#: ../calendar/zones.h:336
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: ../calendar/zones.h:337
+msgid "Europe/Zurich"
+msgstr ""
+
+#: ../calendar/zones.h:338
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: ../calendar/zones.h:339
+msgid "Indian/Chagos"
+msgstr "هندي/چاګوس"
+
+#: ../calendar/zones.h:340
+msgid "Indian/Christmas"
+msgstr "هندي/کرېسمېس"
+
+#: ../calendar/zones.h:341
+msgid "Indian/Cocos"
+msgstr "هندي/کوکوس"
+
+#: ../calendar/zones.h:342
+msgid "Indian/Comoro"
+msgstr "هندي/کومورو"
+
+#: ../calendar/zones.h:343
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: ../calendar/zones.h:344
+msgid "Indian/Mahe"
+msgstr "هندي/ماهي"
+
+#: ../calendar/zones.h:345
+msgid "Indian/Maldives"
+msgstr "هندي/مالديوز"
+
+#: ../calendar/zones.h:346
+msgid "Indian/Mauritius"
+msgstr "هندي/موريشيز"
+
+#: ../calendar/zones.h:347
+msgid "Indian/Mayotte"
+msgstr "هندي/ميوټي"
+
+#: ../calendar/zones.h:348
+msgid "Indian/Reunion"
+msgstr ""
+
+#: ../calendar/zones.h:349
+msgid "Pacific/Apia"
+msgstr ""
+
+#: ../calendar/zones.h:350
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: ../calendar/zones.h:351
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: ../calendar/zones.h:352
+msgid "Pacific/Easter"
+msgstr ""
+
+#: ../calendar/zones.h:353
+msgid "Pacific/Efate"
+msgstr ""
+
+#: ../calendar/zones.h:354
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: ../calendar/zones.h:355
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: ../calendar/zones.h:356
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: ../calendar/zones.h:357
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: ../calendar/zones.h:358
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: ../calendar/zones.h:359
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: ../calendar/zones.h:360
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: ../calendar/zones.h:361
+msgid "Pacific/Guam"
+msgstr ""
+
+#: ../calendar/zones.h:362
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: ../calendar/zones.h:363
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: ../calendar/zones.h:364
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: ../calendar/zones.h:365
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: ../calendar/zones.h:366
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: ../calendar/zones.h:367
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: ../calendar/zones.h:368
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: ../calendar/zones.h:369
+msgid "Pacific/Midway"
+msgstr ""
+
+#: ../calendar/zones.h:370
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: ../calendar/zones.h:371
+msgid "Pacific/Niue"
+msgstr ""
+
+#: ../calendar/zones.h:372
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: ../calendar/zones.h:373
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: ../calendar/zones.h:374
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: ../calendar/zones.h:375
+msgid "Pacific/Palau"
+msgstr ""
+
+#: ../calendar/zones.h:376
+msgid "Pacific/Pitcairn"
+msgstr ""
+
+#: ../calendar/zones.h:377
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: ../calendar/zones.h:378
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: ../calendar/zones.h:379
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: ../calendar/zones.h:380
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: ../calendar/zones.h:381
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: ../calendar/zones.h:382
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: ../calendar/zones.h:383
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: ../calendar/zones.h:384
+msgid "Pacific/Truk"
+msgstr ""
+
+#: ../calendar/zones.h:385
+msgid "Pacific/Wake"
+msgstr ""
+
+#: ../calendar/zones.h:386
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: ../calendar/zones.h:387
+msgid "Pacific/Yap"
+msgstr ""
+
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "خپلساتل شوې دوتنه نه شي پرانيستلی"
+
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "د سمونګر نه استوزه نه شي راوستلی"
+
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "نښلن ورننويستل"
+
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "ن_ښلول"
+
+#: ../composer/e-composer-actions.c:143
+msgid "Untitled Message"
+msgstr "بېسرليکه استوزه"
+
+#: ../composer/e-composer-actions.c:474
+msgid "Attach a file"
+msgstr "دوتنه نښلول"
+
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "بندول_"
+
+#: ../composer/e-composer-actions.c:481
+msgid "Close the current file"
+msgstr "اوسنۍ دوتنه بندول"
+
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "...چاپول_"
+
+#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "چاپ مخ_ليد"
+
+#: ../composer/e-composer-actions.c:502
+msgid "Save the current file"
+msgstr "اوسنۍ دوتنه ساتل"
+
+#: ../composer/e-composer-actions.c:507
+msgid "Save _As..."
+msgstr "...ساتل _په"
+
+#: ../composer/e-composer-actions.c:509
+msgid "Save the current file with a different name"
+msgstr "اوسنۍ دوتنه په بل نوم ساتل"
+
+#: ../composer/e-composer-actions.c:514
+msgid "Save _Draft"
+msgstr "ګارليک _ساتل"
+
+#: ../composer/e-composer-actions.c:516
+msgid "Save as draft"
+msgstr "لکه ګارليک ساتل"
+
+#: ../composer/e-composer-actions.c:521
+msgid "S_end"
+msgstr "ل_ېږل"
+
+#: ../composer/e-composer-actions.c:523
+msgid "Send this message"
+msgstr "دا استوزه لېږل"
+
+#: ../composer/e-composer-actions.c:530
+msgid "Insert Send options"
+msgstr "د لېږلو غوراوي ورننويستل"
+
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "نوې _استوزه"
+
+#: ../composer/e-composer-actions.c:537
+msgid "Open New Message window"
+msgstr "د نوې استوزې کړکۍ پرانيستل"
+
+#: ../composer/e-composer-actions.c:544
+msgid "Character _Encoding"
+msgstr "لوښه _کوډييزونه"
+
+#: ../composer/e-composer-actions.c:551
+msgid "_Security"
+msgstr "خونديتوب_"
+
+#: ../composer/e-composer-actions.c:561
+msgid "PGP _Encrypt"
+msgstr "_کوډه کښل PGP"
+
+#: ../composer/e-composer-actions.c:563
+msgid "Encrypt this message with PGP"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:569
+msgid "PGP _Sign"
+msgstr "نښه_ PGP"
+
+#: ../composer/e-composer-actions.c:571
+msgid "Sign this message with your PGP key"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:577
+msgid "_Prioritize Message"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:579
+msgid "Set the message priority to high"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:585
+msgid "Re_quest Read Receipt"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:587
+msgid "Get delivery notification when your message is read"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:593
+msgid "S/MIME En_crypt"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:595
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:601
+msgid "S/MIME Sig_n"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:603
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:609
+msgid "_Bcc Field"
+msgstr "پ.ل ډګر_"
+
+#: ../composer/e-composer-actions.c:611
+msgid "Toggles whether the BCC field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:617
+msgid "_Cc Field"
+msgstr "څ.ل ډګر_"
+
+#: ../composer/e-composer-actions.c:619
+msgid "Toggles whether the CC field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:625
+msgid "_From Field"
+msgstr "له ډګر_"
+
+#: ../composer/e-composer-actions.c:627
+msgid "Toggles whether the From chooser is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:633
+msgid "_Post-To Field"
+msgstr "ته-لېږل ډګر_"
+
+#: ../composer/e-composer-actions.c:635
+msgid "Toggles whether the Post-To field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:641
+msgid "_Reply-To Field"
+msgstr "ته-ځواب ډګر_"
+
+#: ../composer/e-composer-actions.c:643
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:649
+msgid "_Subject Field"
+msgstr "سرليک ډګر_"
+
+#: ../composer/e-composer-actions.c:651
+msgid "Toggles whether the Subject field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:657
+msgid "_To Field"
+msgstr "ته ډګر_"
+
+#: ../composer/e-composer-actions.c:659
+msgid "Toggles whether the To field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:66
+msgid "Enter the recipients of the message"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:68
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:71
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr ":ل_ه"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr ":ته-ځواب_"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr ":ته_"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr ":څ.ل_"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr ":پ.ل_"
+
+#: ../composer/e-composer-header-table.c:673
+msgid "_Post To:"
+msgstr ":ته لېږل_"
+
+#: ../composer/e-composer-header-table.c:677
+msgid "S_ubject:"
+msgstr ":سرليک_"
+
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr ":لاس_ليک"
+
+#: ../composer/e-composer-name-header.c:114
+msgid "Click here for the address book"
+msgstr "د پته کتاب لپاره دلته کېکاږﺉ"
+
+#: ../composer/e-composer-post-header.c:136
+msgid "Posting destination"
+msgstr "د لېږلو موخه"
+
+#: ../composer/e-composer-post-header.c:137
+msgid "Choose folders to post the message to."
+msgstr ".هغه پوښۍ چې استوزه ورته لېږل غواړﺉ وټاکئ"
+
+#: ../composer/e-composer-post-header.c:171
+msgid "Click here to select folders to post to"
+msgstr ""
+
+#: ../composer/e-composer-private.c:65
+msgid "Recent _Documents"
+msgstr "اوسني _لاسوندونه"
+
+#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+msgid "Show _Attachment Bar"
+msgstr "نښلن _پټه ښودل"
+
+#: ../composer/e-msg-composer.c:873
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:880
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1914
+#: ../mail/em-format-html-display.c:2404 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "نښلن"
+msgstr[1] "نښلنونه"
+
+#: ../composer/e-msg-composer.c:1557
+msgid "Hide _Attachment Bar"
+msgstr "نښلن _پټه پټول"
+
+#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
+msgid "Compose Message"
+msgstr "استوزه ليکل"
+
+#: ../composer/e-msg-composer.c:4056
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)</"
+"b>"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:1
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:2
+msgid "All accounts have been removed."
+msgstr "ټول ګڼونونه وړنګول شول"
+
+#: ../composer/mail-composer.error.xml.h:3
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:4
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:5
+msgid "Because &quot;{1}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:6
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:7
+msgid "Could not create composer window."
+msgstr ".ليکونکې کړکۍ نه شي جوړولی"
+
+#: ../composer/mail-composer.error.xml.h:8
+msgid "Could not create message."
+msgstr ".استوزه نه شي جوړولی"
+
+#: ../composer/mail-composer.error.xml.h:9
+msgid "Could not read signature file &quot;{0}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:10
+msgid "Could not retrieve messages to attach from {0}."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:11
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:12
+msgid "Directories can not be attached to Messages."
+msgstr ".استوزو سره پوښۍ نه شي نښلېدلی"
+
+#: ../composer/mail-composer.error.xml.h:13
+msgid "Do you want to recover unfinished messages?"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:14
+msgid "Download in progress. Do you want to send the mail?"
+msgstr "رالېښنه پرمختګ کې ده. ليک لېږل غواړﺉ؟"
+
+#: ../composer/mail-composer.error.xml.h:15
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:16
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:17
+msgid ""
+"Send options available only for Novell Groupwise and Microsoft Exchange "
+"accounts."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:18
+msgid "Send options not available."
+msgstr ".د لېږلو غوراوي شتون نه لري"
+
+#: ../composer/mail-composer.error.xml.h:19
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:20
+msgid ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:21
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:24
+msgid "Unable to activate the address selector control."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:25
+msgid "Unfinished messages found"
+msgstr "نابشپړې استوزې وموندل شوې"
+
+#: ../composer/mail-composer.error.xml.h:26
+msgid "Warning: Modified Message"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:27
+msgid "You cannot attach the file `{0}' to this message."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:28
+msgid "You need to configure an account before you can compose mail."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:30
+msgid "_Do not Recover"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:306
+msgid "_Recover"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:32
+msgid "_Save Message"
+msgstr "استوزه ساتل_"
+
+#: ../data/evolution.desktop.in.in.h:1
+msgid "Evolution Mail and Calendar"
+msgstr "اېوليوشن ليک او کليز"
+
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
+msgid "Groupware Suite"
+msgstr ""
+
+#: ../data/evolution.desktop.in.in.h:3
+msgid "Manage your email, contacts and schedule"
+msgstr "خپل برېښليکونه، اړيکلوري او مهالوېش سمبال کړﺉ"
+
+#: ../data/evolution.keys.in.in.h:1
+msgid "address card"
+msgstr "پته کارډ"
+
+#: ../data/evolution.keys.in.in.h:2
+msgid "calendar information"
+msgstr "کليز خبرتياوې"
+
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
+msgid "Evolution Error"
+msgstr "د اېوليوشن تېروتنه"
+
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
+msgid "Evolution Warning"
+msgstr "د اېوليوشن خبرتيا"
+
+#: ../e-util/e-error.c:117
+msgid "Evolution Information"
+msgstr "د اېوليوشن خبرتياوې"
+
+#: ../e-util/e-error.c:119
+msgid "Evolution Query"
+msgstr "د اېوليوشن پوښتن"
+
+#. setup a dummy error
+#: ../e-util/e-error.c:449
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr ""
+
+#: ../e-util/e-logger.c:154
+msgid "Component"
+msgstr "رغتوکی"
+
+#: ../e-util/e-logger.c:155
+msgid "Name of the component being logged"
+msgstr ""
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../plugins/plugin-manager/plugin-manager.c:339
+#: ../plugins/publish-calendar/publish-calendar.c:689
+msgid "Enabled"
+msgstr "توانول شوي"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr ""
+
+#: ../e-util/e-print.c:158
+msgid "An error occurred while printing"
+msgstr ""
+
+#: ../e-util/e-print.c:165
+msgid "The printing system reported the following details about the error:"
+msgstr ""
+
+#: ../e-util/e-print.c:171
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:2
+msgid "Cannot open file \"{0}\"."
+msgstr ".دوتنه نه شي پرانيستلی ‎\"{0}\""
+
+#: ../e-util/e-system.error.xml.h:3
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:4
+msgid "Do you wish to overwrite it?"
+msgstr "غواړﺉ چې ځاېناستی يې کړﺉ؟"
+
+#: ../e-util/e-system.error.xml.h:5
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:6
+msgid "Overwrite file?"
+msgstr "دوتنه ځاېناستول غواړﺉ؟"
+
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+msgid "_Overwrite"
+msgstr "ځاېناستول_"
+
+#: ../e-util/e-util-labels.c:37
+msgid "I_mportant"
+msgstr "ا_ړين"
+
+#. red
+#: ../e-util/e-util-labels.c:38
+msgid "_Work"
+msgstr "دنده_"
+
+#. orange
+#: ../e-util/e-util-labels.c:39
+msgid "_Personal"
+msgstr "وګړيز"
+
+#. green
+#: ../e-util/e-util-labels.c:40
+msgid "_To Do"
+msgstr "کول_"
+
+#. blue
+#: ../e-util/e-util-labels.c:41
+msgid "_Later"
+msgstr "وروسته_"
+
+#: ../e-util/e-util-labels.c:309
+msgid "Label _Name:"
+msgstr ":د نښکې _نوم"
+
+#: ../e-util/e-util-labels.c:332
+msgid "Edit Label"
+msgstr "نښکه سمول"
+
+#: ../e-util/e-util-labels.c:332
+msgid "Add Label"
+msgstr "نښکه زياتول"
+
+#: ../e-util/e-util-labels.c:351
+msgid "Label name cannot be empty."
+msgstr ".د نښکې نوم نه شي تشېدی"
+
+#: ../e-util/e-util-labels.c:356
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
+msgstr ""
+
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "%s :تېروتنه GConf"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr ".ټولې نورې تېروتنې يوازې په پايالي کې ښودل کيږي"
+
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "۱ سېکېنډ مخکې"
+msgstr[1] "سېکېنډه مخکې %d"
+
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] "۱ سېکېنډ وروسته"
+msgstr[1] "سېکېنډه وروسته %d"
+
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "۱ مېنټ مخکې"
+msgstr[1] "مېنټه مخکې %d"
+
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] "۱ مېنټ وروسته"
+msgstr[1] "مېنټه وروسته %d"
+
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "۱ ګېنټه مخکې"
+msgstr[1] "ګېنټې مخکې %d"
+
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] "۱ ګېنټه وروسته"
+msgstr[1] "ګېنټې وروسته %d"
+
+#: ../filter/filter-datespec.c:83
+#, c-format
+msgid "1 day ago"
+msgid_plural "%d days ago"
+msgstr[0] "۱ ورځ مخکې"
+msgstr[1] "ورځ مخکې %d"
+
+#: ../filter/filter-datespec.c:83
+#, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] "۱ ورځ وروسته"
+msgstr[1] "ورځې وروسته %d"
+
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "۱ اونۍ مخکې"
+msgstr[1] "اونۍ مخکې %d"
+
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] "۱ اونۍ وروسته"
+msgstr[1] "اونۍ وروسته %d"
+
+#: ../filter/filter-datespec.c:85
+#, c-format
+msgid "1 month ago"
+msgid_plural "%d months ago"
+msgstr[0] "۱ مياشت مخکې"
+msgstr[1] "مياشتې مخکې %d"
+
+#: ../filter/filter-datespec.c:85
+#, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] "۱ مياشت وروسته"
+msgstr[1] "مياشتې وروسته %d"
+
+#: ../filter/filter-datespec.c:86
+#, c-format
+msgid "1 year ago"
+msgid_plural "%d years ago"
+msgstr[0] "۱ کال مخکې"
+msgstr[1] "کاله مخکې %d"
+
+#: ../filter/filter-datespec.c:86
+#, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] "۱ کال وروسته"
+msgstr[1] "کاله وروسته %d"
+
+#: ../filter/filter-datespec.c:287
+msgid "<click here to select a date>"
+msgstr "<د نېټې ټاکلو لپاره دلته کېکاږﺉ>"
+
+#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
+#: ../filter/filter-datespec.c:312
+msgid "now"
+msgstr "اوس"
+
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: ../filter/filter-datespec.c:297
+msgid "%d-%b-%Y"
+msgstr "%d-%b-%Y"
+
+#: ../filter/filter-datespec.c:451
+msgid "Select a time to compare against"
+msgstr ""
+
+#: ../filter/filter-file.c:284
+msgid "Choose a file"
+msgstr "يوه دوتنه وټاکئ"
+
+#: ../filter/filter-part.c:532
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "ازموېل"
+
+#: ../filter/filter-rule.c:851
+msgid "R_ule name:"
+msgstr ":د د_وی نوم"
+
+#: ../filter/filter-rule.c:879
+msgid "Find items that meet the following criteria"
+msgstr ""
+
+#: ../filter/filter-rule.c:913
+msgid "A_dd Filter Criteria"
+msgstr ""
+
+#: ../filter/filter-rule.c:919
+msgid "If all criteria are met"
+msgstr ""
+
+#: ../filter/filter-rule.c:919
+msgid "If any criteria are met"
+msgstr ""
+
+#: ../filter/filter-rule.c:921
+msgid "_Find items:"
+msgstr ":توکي لټول_"
+
+#: ../filter/filter-rule.c:943
+msgid "All related"
+msgstr "ټول تړلي"
+
+#: ../filter/filter-rule.c:943
+msgid "Replies"
+msgstr "ځوابونه"
+
+#: ../filter/filter-rule.c:943
+msgid "Replies and parents"
+msgstr "ځوابونه او پلرين"
+
+#: ../filter/filter-rule.c:943
+msgid "No reply or parent"
+msgstr "هېڅ ځواب يا پلرين"
+
+#: ../filter/filter-rule.c:945
+msgid "I_nclude threads"
+msgstr "مزي ن_نويستل"
+
+#: ../filter/filter-rule.c:1043 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
+msgid "Incoming"
+msgstr "راتلونکی"
+
+#: ../filter/filter-rule.c:1043 ../mail/em-utils.c:309
+msgid "Outgoing"
+msgstr "تلونکی"
+
+#: ../filter/filter.error.xml.h:1
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:2
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:3
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:4
+msgid "Missing date."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:5
+msgid "Missing file name."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+msgid "Missing name."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:7
+msgid "Name &quot;{0}&quot; already used."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:8
+msgid "Please choose another name."
+msgstr ".لورينه وکړﺉ بل نوم وټاکئ"
+
+#: ../filter/filter.error.xml.h:9
+msgid "You must choose a date."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:10
+msgid "You must name this filter."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:11
+msgid "You must specify a file name."
+msgstr ""
+
+#: ../filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>_چاڼ دوی</b>"
+
+#: ../filter/filter.glade.h:2
+msgid "Compare against"
+msgstr ""
+
+#: ../filter/filter.glade.h:4
+msgid "Show filters for mail:"
+msgstr ":د ليک لپاره چاڼونه ښودل"
+
+#: ../filter/filter.glade.h:5
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: ../filter/filter.glade.h:7
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+
+#: ../filter/filter.glade.h:9
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: ../filter/filter.glade.h:12
+msgid "a time relative to the current time"
+msgstr ""
+
+#: ../filter/filter.glade.h:13
+msgid "ago"
+msgstr "مخکې"
+
+#: ../filter/filter.glade.h:16
+msgid "in the future"
+msgstr "په راتلونکي کې"
+
+#: ../filter/filter.glade.h:18
+msgid "months"
+msgstr "مياشتې"
+
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
+msgid "seconds"
+msgstr "سېکېنډه"
+
+#: ../filter/filter.glade.h:20
+msgid "the current time"
+msgstr "اوسنی مهال"
+
+#: ../filter/filter.glade.h:21
+msgid "the time you specify"
+msgstr "کوم مهال چې تاسو ټاکئ"
+
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
+#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/google-account-setup/google-source.c:404
+msgid "weeks"
+msgstr "اونۍ"
+
+#: ../filter/filter.glade.h:23
+msgid "years"
+msgstr "کاله"
+
+#: ../filter/rule-editor.c:380
+msgid "Add Rule"
+msgstr "دوی زياتول"
+
+#: ../filter/rule-editor.c:459
+msgid "Edit Rule"
+msgstr "دوی سمول"
+
+#: ../filter/rule-editor.c:786
+msgid "Rule name"
+msgstr "د دوی نوم"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "د ليکونکي غوراوي"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "خپل برېښليک ګڼونونه دلته وسازوﺉ"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "اېوليوشن ليک"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "اېوليوشن ليک رغتوکی"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "اېوليوشن ليک ليکونکی"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "د اېوليوشن ليک غوراويو مهار"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Network configuration control"
+msgstr "د اېوليوشن ځال سازونې مهار"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../mail/mail-component.c:593 ../mail/mail-component.c:594
+#: ../mail/mail-component.c:758
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+msgid "Mail"
+msgstr "ليک"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
+msgid "Mail Accounts"
+msgstr "ليک ګڼونونه"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
+msgid "Mail Preferences"
+msgstr "ليک غوراوي"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "ځال غوراوي"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
+msgid "_Mail"
+msgstr "ليک_"
+
+#: ../mail/em-account-editor.c:387
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: ../mail/em-account-editor.c:394
+#, c-format
+msgid ""
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+msgstr ""
+
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:512
+msgid "Select Folder"
+msgstr "پوښۍ ټاکل"
+
+#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:97
+msgid "Autogenerated"
+msgstr ""
+
+#: ../mail/em-account-editor.c:762
+msgid "Ask for each message"
+msgstr "د هرې استوزې لپاره پوښتل"
+
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
+msgid "Identity"
+msgstr "پیژندنه"
+
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:123
+msgid "Receiving Email"
+msgstr "برېښليک راوستل کيږي"
+
+#: ../mail/em-account-editor.c:2041
+msgid "Check for _new messages every"
+msgstr "د _نوېو استوزو لپاره کتل هر"
+
+#: ../mail/em-account-editor.c:2049
+msgid "minu_tes"
+msgstr "مېن_ټه"
+
+#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:135
+msgid "Sending Email"
+msgstr "برېښليک لېږل کيږي"
+
+#: ../mail/em-account-editor.c:2282 ../mail/mail-config.glade.h:67
+msgid "Defaults"
+msgstr "تلوالې"
+
+#. Security settings
+#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:130
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
+msgid "Security"
+msgstr "خونديتوب"
+
+#. Most sections for this is auto-generated fromt the camel config
+#: ../mail/em-account-editor.c:2385 ../mail/em-account-editor.c:2476
+msgid "Receiving Options"
+msgstr "د نيوونې غوراوي"
+
+#: ../mail/em-account-editor.c:2386 ../mail/em-account-editor.c:2477
+msgid "Checking for New Messages"
+msgstr "د نوېو استوزو لپاره کتل کيږي"
+
+#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "ګڼون سمونګر"
+
+#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:83
+msgid "Evolution Account Assistant"
+msgstr "اېوليوشن ګڼون مرستيال"
+
+#. translators: default account indicator
+#: ../mail/em-account-prefs.c:429
+msgid "[Default]"
+msgstr "[تلواله]"
+
+#: ../mail/em-account-prefs.c:488
+msgid "Account name"
+msgstr "ګڼون نوم"
+
+#: ../mail/em-account-prefs.c:490
+msgid "Protocol"
+msgstr "باندره"
+
+#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
+msgid "Unnamed"
+msgstr "بېنومه"
+
+#: ../mail/em-composer-prefs.c:992
+msgid "Language(s)"
+msgstr "ژبه"
+
+#: ../mail/em-composer-prefs.c:1041
+msgid "Add signature script"
+msgstr "لاسليک سکرېپټ زياتول"
+
+#: ../mail/em-composer-prefs.c:1083
+msgid "Signature(s)"
+msgstr "لاسليک(ونه)"
+
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
+msgid "-------- Forwarded Message --------"
+msgstr "-------- مخکې شوې استوزه --------"
+
+#: ../mail/em-composer-utils.c:1960
+msgid "an unknown sender"
+msgstr "ناپېژندلی استوونکی"
+
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: ../mail/em-composer-utils.c:2007
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: ../mail/em-composer-utils.c:2150
+msgid "-----Original Message-----"
+msgstr "-----اره استوزه-----"
+
+#: ../mail/em-filter-editor.c:156
+msgid "_Filter Rules"
+msgstr "چاڼ دوی_"
+
+#. Automatically generated. Do not edit.
+#: ../mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "شمېرې برابرول"
+
+#: ../mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "رنګ ټاکل"
+
+#: ../mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "شمېرې ټاکل"
+
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "پ.ل"
+
+#: ../mail/em-filter-i18n.h:7
+msgid "Beep"
+msgstr "بيپ"
+
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "څ.ل"
+
+#: ../mail/em-filter-i18n.h:9
+msgid "Completed On"
+msgstr "بشپړ شوی په"
+
+#: ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "پوښۍ ته لمېسل"
+
+#: ../mail/em-filter-i18n.h:12
+msgid "Date received"
+msgstr "د رسېدلو نېټه"
+
+#: ../mail/em-filter-i18n.h:13
+msgid "Date sent"
+msgstr "د لېږلو نېټه"
+
+#: ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:767
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "ړنګول"
+
+#: ../mail/em-filter-i18n.h:15
+msgid "Deleted"
+msgstr "ړنګېدلی"
+
+#: ../mail/em-filter-i18n.h:17
+msgid "does not end with"
+msgstr "نه پايږي په"
+
+#: ../mail/em-filter-i18n.h:18
+msgid "does not exist"
+msgstr "شتون نه لري"
+
+#: ../mail/em-filter-i18n.h:19
+msgid "does not return"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:20
+msgid "does not sound like"
+msgstr "داسې نه ښکاري لکه"
+
+#: ../mail/em-filter-i18n.h:21
+msgid "does not start with"
+msgstr "نه پېليږي په"
+
+#: ../mail/em-filter-i18n.h:23
+msgid "Draft"
+msgstr "ګارلیک"
+
+#: ../mail/em-filter-i18n.h:24
+msgid "ends with"
+msgstr "پايږي په"
+
+#: ../mail/em-filter-i18n.h:26
+msgid "exists"
+msgstr "شته دی"
+
+#: ../mail/em-filter-i18n.h:27
+msgid "Expression"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:28
+msgid "Follow Up"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+msgid "Important"
+msgstr "اړين"
+
+#: ../mail/em-filter-i18n.h:31
+msgid "is after"
+msgstr "وروسته دی له"
+
+#: ../mail/em-filter-i18n.h:32
+msgid "is before"
+msgstr "مخکی دی له"
+
+#: ../mail/em-filter-i18n.h:33
+msgid "is Flagged"
+msgstr "جنډول شوی"
+
+#: ../mail/em-filter-i18n.h:37
+msgid "is not Flagged"
+msgstr "نه دی جنډول شوی"
+
+#: ../mail/em-filter-i18n.h:38
+msgid "is not set"
+msgstr "نه دی ټاکل شوی"
+
+#: ../mail/em-filter-i18n.h:39
+msgid "is set"
+msgstr "ټاکل شوی"
+
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
+#: ../ui/evolution-mail-message.xml.h:48
+msgid "Junk"
+msgstr "سرکودن"
+
+#: ../mail/em-filter-i18n.h:41
+msgid "Junk Test"
+msgstr "سرکودن ازموېنه"
+
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+msgid "Label"
+msgstr "نښکه"
+
+#: ../mail/em-filter-i18n.h:43
+msgid "Mailing list"
+msgstr "ليک لړ"
+
+#: ../mail/em-filter-i18n.h:44
+msgid "Match All"
+msgstr "ټول سارول"
+
+#: ../mail/em-filter-i18n.h:45
+msgid "Message Body"
+msgstr "د استوزې تنه"
+
+#: ../mail/em-filter-i18n.h:46
+msgid "Message Header"
+msgstr "د استوزې سريز"
+
+#: ../mail/em-filter-i18n.h:47
+msgid "Message is Junk"
+msgstr "استوزه سرکودنه ده"
+
+#: ../mail/em-filter-i18n.h:48
+msgid "Message is not Junk"
+msgstr "استوزه سرکودنه نه ده"
+
+#: ../mail/em-filter-i18n.h:49
+msgid "Move to Folder"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:50
+msgid "Pipe to Program"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:51
+msgid "Play Sound"
+msgstr "غږ غږول"
+
+#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
+#. Translators: "Read" as in "has been read" (message-tag-followup.c)
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
+msgid "Read"
+msgstr "لوستل"
+
+#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+msgid "Recipients"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:55
+msgid "Regex Match"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:56
+msgid "Replied to"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:57
+msgid "returns"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:58
+msgid "returns greater than"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:59
+msgid "returns less than"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:60
+msgid "Run Program"
+msgstr "کړنلار ځغلول"
+
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+msgid "Score"
+msgstr "شمېره"
+
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+msgid "Sender"
+msgstr "استوونی"
+
+#: ../mail/em-filter-i18n.h:63
+msgid "Set Label"
+msgstr "نښکه ټاکل"
+
+#: ../mail/em-filter-i18n.h:64
+msgid "Set Status"
+msgstr "انکړ ټاکل"
+
+#: ../mail/em-filter-i18n.h:65
+msgid "Size (kB)"
+msgstr "(kB) کچ "
+
+#: ../mail/em-filter-i18n.h:66
+msgid "sounds like"
+msgstr "ښکاري لکه"
+
+#: ../mail/em-filter-i18n.h:67
+msgid "Source Account"
+msgstr "سرچينه ګڼون"
+
+#: ../mail/em-filter-i18n.h:68
+msgid "Specific header"
+msgstr "ځانګړی سريز"
+
+#: ../mail/em-filter-i18n.h:69
+msgid "starts with"
+msgstr "پېليږي په"
+
+#: ../mail/em-filter-i18n.h:71
+msgid "Stop Processing"
+msgstr "بهيرونه تمول"
+
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:318
+#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../smime/lib/e-cert.c:1132
+msgid "Subject"
+msgstr "سرليک"
+
+#: ../mail/em-filter-i18n.h:73
+msgid "Unset Status"
+msgstr "ناټاکلی انکړ"
+
+#. and now for the action area
+#: ../mail/em-filter-rule.c:521
+msgid "Then"
+msgstr "بيا"
+
+#: ../mail/em-filter-rule.c:549
+msgid "Add Ac_tion"
+msgstr "چرار زياتول"
+
+#: ../mail/em-folder-browser.c:189
+msgid "C_reate Search Folder From Search..."
+msgstr ""
+
+#: ../mail/em-folder-browser.c:214
+msgid "All Messages"
+msgstr "ټولې استوزې"
+
+#: ../mail/em-folder-browser.c:215
+msgid "Unread Messages"
+msgstr "نالوستې استوزې"
+
+#: ../mail/em-folder-browser.c:217
+msgid "No Label"
+msgstr "هېڅ نښکه"
+
+#: ../mail/em-folder-browser.c:224
+msgid "Read Messages"
+msgstr "لوستې استوزې"
+
+#: ../mail/em-folder-browser.c:225
+msgid "Recent Messages"
+msgstr "اوسنۍ استوزې"
+
+#: ../mail/em-folder-browser.c:226
+msgid "Last 5 Days' Messages"
+msgstr "د تېرو ۵ ورځو استوزې"
+
+#: ../mail/em-folder-browser.c:227
+msgid "Messages with Attachments"
+msgstr "استوزې د نښلنونو سره"
+
+#: ../mail/em-folder-browser.c:228
+msgid "Important Messages"
+msgstr "اړينې استوزې"
+
+#: ../mail/em-folder-browser.c:229
+msgid "Messages Not Junk"
+msgstr "استوزه سرکودن نه ده"
+
+#: ../mail/em-folder-browser.c:1153
+msgid "Account Search"
+msgstr "ګڼون لټون"
+
+#: ../mail/em-folder-browser.c:1206
+msgid "All Account Search"
+msgstr "ټول ګڼون لټون"
+
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:173
+msgid "Unread messages:"
+msgid_plural "Unread messages:"
+msgstr[0] ":نالوستي استوزې"
+msgstr[1] ":نالوستي استوزې"
+
+#. TODO: can this be done in a loop?
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:177
+msgid "Total messages:"
+msgid_plural "Total messages:"
+msgstr[0] ":ټولې استوزې"
+msgstr[1] ":ټولې استوزې"
+
+#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+msgid "Quota usage"
+msgstr ""
+
+#: ../mail/em-folder-properties.c:385
+#: ../plugins/groupwise-features/properties.glade.h:4
+msgid "Folder Properties"
+msgstr "پوښۍ ځانتياوې"
+
+#: ../mail/em-folder-selection-button.c:120
+msgid "<click here to select a folder>"
+msgstr "<د پوښۍ ټاکلو لپاره دلته کېکاږﺉ>"
+
+#: ../mail/em-folder-selector.c:254
+msgid "C_reate"
+msgstr "ج_وړول"
+
+#: ../mail/em-folder-selector.c:258
+msgid "Folder _name:"
+msgstr ":د پوښۍ نوم_"
+
+#. load store to mail component at the end, when everything is loaded
+#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
+msgid "Search Folders"
+msgstr "پوښۍ پلټل"
+
+#. UNMATCHED is always last
+#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+msgid "UNMATCHED"
+msgstr ""
+
+#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:161
+msgid "Drafts"
+msgstr "ګارليک"
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2540
+#: ../mail/mail-component.c:160
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
+msgid "Inbox"
+msgstr "دننبکس"
+
+#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:162
+msgid "Outbox"
+msgstr "بهربکس"
+
+#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:163
+msgid "Sent"
+msgstr "لېږلي"
+
+#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+msgid "Loading..."
+msgstr "...لېښل کيږي"
+
+#. Translators: This is the string used for displaying the
+#. * folder names in folder trees. "%s" will be replaced by
+#. * the folder's name and "%u" will be replaced with the
+#. * number of unread messages in the folder.
+#. *
+#. * Most languages should translate this as "%s (%u)". The
+#. * languages that use localized digits (like Persian) may
+#. * need to replace "%u" with "%Iu". Right-to-left languages
+#. * (like Arabic and Hebrew) may need to add bidirectional
+#. * formatting codes to take care of the cases the folder
+#. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
+#.
+#: ../mail/em-folder-tree.c:371
+#, c-format
+msgid "folder-display|%s (%u)"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:732
+msgid "Mail Folder Tree"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:891
+#, c-format
+msgid "Moving folder %s"
+msgstr "پوښۍ خوځول کيږي %s"
+
+#: ../mail/em-folder-tree.c:893
+#, c-format
+msgid "Copying folder %s"
+msgstr "پوښۍ لمېسل کيږي %s"
+
+#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1955
+#, c-format
+msgid "Moving messages into folder %s"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1957
+#, c-format
+msgid "Copying messages into folder %s"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:917
+msgid "Cannot drop message(s) into toplevel store"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:994 ../ui/evolution-mail-message.xml.h:105
+msgid "_Copy to Folder"
+msgstr "پوښۍ لمېسل_"
+
+#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:118
+msgid "_Move to Folder"
+msgstr "پوښۍ ته خوځول_"
+
+#: ../mail/em-folder-tree.c:1709 ../mail/mail-ops.c:1056
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr ""
+
+#: ../mail/em-folder-tree.c:2083
+msgid "Open in _New Window"
+msgstr "په نوې _کړکۍ کې پرانيستل"
+
+#. FIXME: need to disable for nochildren folders
+#: ../mail/em-folder-tree.c:2088
+msgid "_New Folder..."
+msgstr "...نوې پوښۍ_"
+
+#: ../mail/em-folder-tree.c:2091
+msgid "_Move..."
+msgstr "...خوځول_"
+
+#: ../mail/em-folder-tree.c:2098 ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "...بيانومول_"
+
+#: ../mail/em-folder-tree.c:2099
+msgid "Re_fresh"
+msgstr "تا_ندول"
+
+#: ../mail/em-folder-tree.c:2100
+msgid "Fl_ush Outbox"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:2106 ../mail/mail.error.xml.h:138
+msgid "_Empty Trash"
+msgstr "خځلنۍ تشول_"
+
+#: ../mail/em-folder-utils.c:103
+#, c-format
+msgid "Copying `%s' to `%s'"
+msgstr ""
+
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
+#: ../mail/importers/evolution-mbox-importer.c:83
+msgid "Select folder"
+msgstr "پوښۍ ټاکل"
+
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
+msgid "C_opy"
+msgstr "ل_مېسل"
+
+#: ../mail/em-folder-utils.c:587
+#: ../plugins/groupwise-features/share-folder-common.c:143
+#, c-format
+msgid "Creating folder `%s'"
+msgstr "پوښۍ جوړول کيږي `%s'"
+
+#: ../mail/em-folder-utils.c:745
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
+msgid "Create folder"
+msgstr "پوښۍ جوړول"
+
+#: ../mail/em-folder-utils.c:745
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
+msgid "Specify where to create the folder:"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
+msgid "Mail Deletion Failed"
+msgstr "د ليک ړنګېدنه پاتې راغله"
+
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr ""
+
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
+msgid "_Reply to Sender"
+msgstr "استوونکی ځوابول_"
+
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
+#: ../ui/evolution-mail-message.xml.h:110
+msgid "_Forward"
+msgstr "مخکې_"
+
+#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
+msgid "_Edit as New Message..."
+msgstr "...لکه نوې استوزه سمول_"
+
+#: ../mail/em-folder-view.c:1348
+msgid "U_ndelete"
+msgstr "ن_اړنګول"
+
+#: ../mail/em-folder-view.c:1349
+msgid "_Move to Folder..."
+msgstr "...پوښۍ ته خوځول_"
+
+#: ../mail/em-folder-view.c:1350
+msgid "_Copy to Folder..."
+msgstr "...پوښۍ ته لمېسل_"
+
+#: ../mail/em-folder-view.c:1353
+msgid "Mar_k as Read"
+msgstr "لکه لوستی نښو_ل"
+
+#: ../mail/em-folder-view.c:1354
+msgid "Mark as _Unread"
+msgstr "لکه _نالوستی نښول"
+
+#: ../mail/em-folder-view.c:1355
+msgid "Mark as _Important"
+msgstr "لکه _اړين نښول"
+
+#: ../mail/em-folder-view.c:1356
+msgid "Mark as Un_important"
+msgstr "لکه _نااړين نښودل"
+
+#: ../mail/em-folder-view.c:1357
+msgid "Mark as _Junk"
+msgstr "لکه _سرکودن نښول"
+
+#: ../mail/em-folder-view.c:1358
+msgid "Mark as _Not Junk"
+msgstr "لکه سرکودن _نه نښودل"
+
+#: ../mail/em-folder-view.c:1359
+msgid "Mark for Follo_w Up..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:1361
+msgid "_Label"
+msgstr "نښکه_"
+
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
+msgid "_None"
+msgstr "هېڅ_"
+
+#: ../mail/em-folder-view.c:1365
+msgid "_New Label"
+msgstr "نوې نښکه"
+
+#: ../mail/em-folder-view.c:1369
+msgid "Fla_g Completed"
+msgstr "جن_ډه بشپړه شوه"
+
+#: ../mail/em-folder-view.c:1370
+msgid "Cl_ear Flag"
+msgstr "جنډه پا_کول"
+
+#: ../mail/em-folder-view.c:1373
+msgid "Crea_te Rule From Message"
+msgstr ""
+
+#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
+#: ../mail/em-folder-view.c:1375
+msgid "Search Folder based on _Subject"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1376
+msgid "Search Folder based on Se_nder"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1377
+msgid "Search Folder based on _Recipients"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1378
+msgid "Search Folder based on Mailing _List"
+msgstr ""
+
+#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
+#: ../mail/em-folder-view.c:1383
+msgid "Filter based on Sub_ject"
+msgstr "چاڼ د سر_ليک پر بنسټ"
+
+#: ../mail/em-folder-view.c:1384
+msgid "Filter based on Sen_der"
+msgstr "چاڼ د است_ووني پر بنسټ"
+
+#: ../mail/em-folder-view.c:1385
+msgid "Filter based on Re_cipients"
+msgstr "چاڼ د ني_وونی پر بنسټ"
+
+#: ../mail/em-folder-view.c:1386
+msgid "Filter based on _Mailing List"
+msgstr "چاڼ د _ليک لړ پر بنسټ"
+
+#. default charset used in mail view
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
+msgid "Default"
+msgstr "تلواله"
+
+#: ../mail/em-folder-view.c:2531
+msgid "Unable to retrieve message"
+msgstr "استوزه نه شي راوستلی"
+
+#: ../mail/em-folder-view.c:2550
+msgid "Retrieving Message..."
+msgstr "استوزه راوستل کيږي..."
+
+#: ../mail/em-folder-view.c:2809
+msgid "C_all To..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:2812
+msgid "Create _Search Folder"
+msgstr "پلټون _پوښۍ جوړول"
+
+#: ../mail/em-folder-view.c:2813
+msgid "_From this Address"
+msgstr "له دې پتې_"
+
+#: ../mail/em-folder-view.c:2814
+msgid "_To this Address"
+msgstr "دې پتې ته_"
+
+#: ../mail/em-folder-view.c:3311
+#, c-format
+msgid "Click to mail %s"
+msgstr ""
+
+#: ../mail/em-folder-view.c:3323
+#, c-format
+msgid "Click to call %s"
+msgstr ""
+
+#: ../mail/em-folder-view.c:3328
+msgid "Click to hide/unhide addresses"
+msgstr "د پتو پټولو/ښودلو لپاره کېکاږﺉ"
+
+#. message-search popup match count string
+#: ../mail/em-format-html-display.c:472
+#, c-format
+msgid "Matches: %d"
+msgstr "%d :ساري"
+
+#: ../mail/em-format-html-display.c:616
+msgid "Fin_d:"
+msgstr "لټو_ل:"
+
+#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
+#: ../mail/em-format-html-display.c:640
+msgid "_Previous"
+msgstr "مخکنی_"
+
+#: ../mail/em-format-html-display.c:645
+msgid "_Next"
+msgstr "راتلوکی_"
+
+#: ../mail/em-format-html-display.c:650
+msgid "M_atch case"
+msgstr "کېس س_ارول"
+
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
+msgid "Unsigned"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:949
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
+msgid "Valid signature"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:950
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
+msgid "Invalid signature"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:951
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
+msgid "Valid signature, but cannot verify sender"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:952
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
+msgid "Signature exists, but need public key"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:953
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
+msgid "Unencrypted"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:960
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
+msgid "Encrypted, weak"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:961
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
+msgid "Encrypted"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:962
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
+msgid "Encrypted, strong"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:963
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1064 ../smime/gui/smime-ui.glade.h:48
+msgid "_View Certificate"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1079
+msgid "This certificate is not viewable"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1372
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1380
+msgid "Overdue:"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1383
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%B %d, %Y, %l:%M %p ‎په"
+
+#: ../mail/em-format-html-display.c:1461
+msgid "_View Inline"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1462
+msgid "_Hide"
+msgstr "پټول_"
+
+#: ../mail/em-format-html-display.c:1463
+msgid "_Fit to Width"
+msgstr "پلنوالي سره برابرول_"
+
+#: ../mail/em-format-html-display.c:1464
+msgid "Show _Original Size"
+msgstr "ار _کچ ښودل"
+
+#: ../mail/em-format-html-display.c:1984
+msgid "Save attachment as"
+msgstr "نښلن ساتل لکه"
+
+#: ../mail/em-format-html-display.c:1988
+msgid "Select folder to save all attachments"
+msgstr "د ټولو نښلنونو ساتلو لپاره پوښۍ وټاکئ"
+
+#: ../mail/em-format-html-display.c:2039
+msgid "_Save Selected..."
+msgstr "...ټاکل شوی ساتل_"
+
+#. Cant i put in the number of attachments here ?
+#: ../mail/em-format-html-display.c:2106
+#, c-format
+msgid "%d at_tachment"
+msgid_plural "%d at_tachments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/em-format-html-display.c:2113 ../mail/em-format-html-display.c:2202
+msgid "S_ave"
+msgstr "س_اتل"
+
+#: ../mail/em-format-html-display.c:2124
+msgid "S_ave All"
+msgstr "ټول س_اتل"
+
+#: ../mail/em-format-html-display.c:2198
+msgid "No Attachment"
+msgstr "هېڅ نښلنونه"
+
+#: ../mail/em-format-html-display.c:2339 ../mail/em-format-html-display.c:2377
+msgid "View _Unformatted"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:2341
+msgid "Hide _Unformatted"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:2396
+msgid "O_pen With"
+msgstr "سره پ_رانيستل"
+
+#: ../mail/em-format-html-display.c:2467
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+
+#: ../mail/em-format-html-print.c:156
+#, c-format
+msgid "Page %d of %d"
+msgstr "مخ %d له %d"
+
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
+#, c-format
+msgid "Retrieving `%s'"
+msgstr ""
+
+#: ../mail/em-format-html.c:925
+msgid "Unknown external-body part."
+msgstr ""
+
+#: ../mail/em-format-html.c:933
+msgid "Malformed external-body part."
+msgstr ""
+
+#: ../mail/em-format-html.c:963
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: ../mail/em-format-html.c:974
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: ../mail/em-format-html.c:976
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr ""
+
+#: ../mail/em-format-html.c:997
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: ../mail/em-format-html.c:1008
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: ../mail/em-format-html.c:1236
+msgid "Formatting message"
+msgstr "استوزه بڼول کيږي"
+
+#: ../mail/em-format-html.c:1410
+msgid "Formatting Message..."
+msgstr "...استوزه بڼول کيږي"
+
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
+msgid "Cc"
+msgstr "څ.ل"
+
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
+msgid "Bcc"
+msgstr "پ.ل"
+
+#. pseudo-header
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1450
+msgid "Mailer"
+msgstr "استوونکی"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: ../mail/em-format-html.c:1771
+msgid " (%a, %R %Z)"
+msgstr " (%a, %R %Z)"
+
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: ../mail/em-format-html.c:1776
+msgid " (%R %Z)"
+msgstr " (%R %Z)"
+
+#. To translators: This message suggests to the receipients that the sender of the mail is
+#. different from the one listed in From field.
+#.
+#: ../mail/em-format-html.c:1907
+#, c-format
+msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:314
+msgid "From"
+msgstr "له"
+
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
+msgid "Reply-To"
+msgstr ""
+
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
+#: ../widgets/misc/e-dateedit.c:353
+msgid "Date"
+msgstr "نېټه"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr ""
+
+#: ../mail/em-format.c:1157
+#, c-format
+msgid "%s attachment"
+msgstr "نښلن %s"
+
+#: ../mail/em-format.c:1198
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr ""
+
+#: ../mail/em-format.c:1335 ../mail/em-format.c:1491
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+
+#: ../mail/em-format.c:1343
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: ../mail/em-format.c:1353
+msgid "Could not parse PGP/MIME message"
+msgstr ""
+
+#: ../mail/em-format.c:1353
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr ""
+
+#: ../mail/em-format.c:1510
+msgid "Unsupported signature format"
+msgstr ""
+
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1589
+msgid "Error verifying signature"
+msgstr ""
+
+#: ../mail/em-format.c:1518 ../mail/em-format.c:1580 ../mail/em-format.c:1589
+msgid "Unknown error verifying signature"
+msgstr ""
+
+#: ../mail/em-format.c:1661
+msgid "Could not parse PGP message"
+msgstr ""
+
+#: ../mail/em-format.c:1661
+msgid "Could not parse PGP message: Unknown error"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:93
+msgid "Every time"
+msgstr "هر مهال"
+
+#: ../mail/em-mailer-prefs.c:94
+msgid "Once per day"
+msgstr "د ورځې يو ځل"
+
+#: ../mail/em-mailer-prefs.c:95
+msgid "Once per week"
+msgstr "د اونۍ يو ځل"
+
+#: ../mail/em-mailer-prefs.c:96
+msgid "Once per month"
+msgstr "د مياشتې يو ځل"
+
+#: ../mail/em-mailer-prefs.c:326
+msgid "Add Custom Junk Header"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:330
+msgid "Header Name:"
+msgstr ":د سريز نوم"
+
+#: ../mail/em-mailer-prefs.c:331
+msgid "Header Value Contains:"
+msgstr ":د سريز ارزښت لري"
+
+#: ../mail/em-mailer-prefs.c:436
+msgid "Contains Value"
+msgstr "ارزښت لري"
+
+#: ../mail/em-mailer-prefs.c:458
+msgid "Color"
+msgstr "رنګ"
+
+#: ../mail/em-mailer-prefs.c:461
+msgid "Tag"
+msgstr "بچوۍ"
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr ""
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:1107
+msgid "No Junk plugin available"
+msgstr ""
+
+#. green
+#: ../mail/em-migrate.c:1059
+msgid "To Do"
+msgstr "کول"
+
+#. blue
+#: ../mail/em-migrate.c:1060
+msgid "Later"
+msgstr "وروسته"
+
+#: ../mail/em-migrate.c:1247
+#, fuzzy, c-format
+msgid "Migrating '%s':"
+msgstr ":لېږدول کيږي `%s'"
+
+#: ../mail/em-migrate.c:1652
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:1678
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:1863
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:1868
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../mail/em-migrate.c:2069
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2083
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2112
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2898
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../mail/em-migrate.c:2963
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2982
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+msgid "_Reply to sender"
+msgstr "استوونکی ځوابول_"
+
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../ui/evolution-mail-message.xml.h:83
+msgid "Reply to _List"
+msgstr "لړ _ځوابول"
+
+#. make it first item
+#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
+msgid "_Add to Address Book"
+msgstr "پته کتاب کې زياتول_"
+
+#: ../mail/em-subscribe-editor.c:583
+msgid "This store does not support subscriptions, or they are not enabled."
+msgstr ""
+
+#: ../mail/em-subscribe-editor.c:616
+msgid "Subscribed"
+msgstr ""
+
+#: ../mail/em-subscribe-editor.c:620
+msgid "Folder"
+msgstr "پوښۍ"
+
+#. FIXME: This is just to get the shadow, is there a better way?
+#: ../mail/em-subscribe-editor.c:822
+msgid "Please select a server."
+msgstr "لورينه وکړﺉ يو پالنګر وټاکئ"
+
+#: ../mail/em-subscribe-editor.c:843
+msgid "No server has been selected"
+msgstr "کوم پالنګر نه دی ټاکل شوی"
+
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
+msgid "_Do not show this message again."
+msgstr ""
+
+#: ../mail/em-utils.c:316
+msgid "Message Filters"
+msgstr "استوزه چاڼونه"
+
+#: ../mail/em-utils.c:369
+msgid "message"
+msgstr "استوزه"
+
+#: ../mail/em-utils.c:653
+msgid "Save Message..."
+msgstr "...استوزه ساتل"
+
+#: ../mail/em-utils.c:703
+msgid "Add address"
+msgstr "پته زياتول"
+
+#. Drop filename for messages from a mailbox
+#: ../mail/em-utils.c:1224
+#, c-format
+msgid "Messages from %s"
+msgstr ""
+
+#: ../mail/em-vfolder-editor.c:112
+msgid "Search _Folders"
+msgstr "پلټون _پوښۍ"
+
+#: ../mail/em-vfolder-rule.c:592
+msgid "Search Folder source"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Send and Receive Mail\" window width"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "Allows evolution to display text part of limited size"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "Always request read receipt"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:7
+msgid "Automatic emoticon recognition"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:8
+msgid "Automatic link recognition"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:9
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:10
+msgid "Citation highlight color"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:11
+msgid "Citation highlight color."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:12
+msgid "Composer Window default height"
+msgstr "د ليکونکې کړکۍ تلواله اوږدوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:13
+msgid "Composer Window default width"
+msgstr "د ليکونکې کړکۍ تلواله پلنوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:14
+msgid "Composer load/attach directory"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:15
+msgid "Compress display of addresses in TO/CC/BCC"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:16
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid "Custom headers to use while checking for junk."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Default charset in which to compose messages"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Default charset in which to compose messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid "Default charset in which to display messages"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:22
+msgid "Default charset in which to display messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:23
+msgid "Default forward style"
+msgstr "د مخکې کولو تلواله ډول"
+
+#: ../mail/evolution-mail.schemas.in.h:24
+msgid "Default height of the Composer Window."
+msgstr ".د ليکونکې کړکۍ تلواله اوږدوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Default height of the message window."
+msgstr ".د استوزې کړکۍ تلواله اوږدوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid "Default height of the subscribe dialog."
+msgstr "د ګډون کړکۍ تلواله اوږدوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Default reply style"
+msgstr "د ځوابولو تلواله ډول"
+
+#: ../mail/evolution-mail.schemas.in.h:28
+msgid "Default value for thread expand state"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid "Default width of the Composer Window."
+msgstr ".د ليکونکې کړکۍ تلواله پلنوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:30
+msgid "Default width of the message window."
+msgstr ".د استوزه کړکۍ تلواله پلنوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid "Default width of the subscribe dialog."
+msgstr ".د ګډون کړکۍ تلواله پلنوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid ""
+"Determines whether to look up addresses for junk filtering in local "
+"addressbook only"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid "Determines whether to lookup in addressbook for sender email"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid ""
+"Determines whether to loopup the sender email in addressbook. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote addressbooks (like ldap) are marked for "
+"autocompletion."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:35
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:36
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:37
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:38
+msgid "Directory for loading/attaching files to composer."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:39
+msgid "Directory for saving mail component files."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:42
+msgid "Empty Junk folders on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "Empty Trash folders on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:44
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:46
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:47
+msgid "Enable or disable magic space bar"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Enable or disable type ahead search feature"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:49
+msgid "Enable search folders"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid "Enable search folders on startup."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:51
+msgid ""
+"Enable side bar search feature so that you can start interactive searching "
+"by typing in the text. Use is that you can easily find a folder in that side "
+"bar by just typing the folder name and the selection jumps automatically to "
+"that folder."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:52
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:53
+msgid "Enable to render message text part of limited size."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:54
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid "Height of the message-list pane"
+msgstr "د استوزه-لړ چوکاټ اوږدوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:56
+msgid "Height of the message-list pane."
+msgstr ".د استوزه-لړ چوکاټ اوږدوالی"
+
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid "Hides the per-folder preview and removes the selection"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:58
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid ""
+"If the \"Preview\" pane is on, then show it side-by-side rather than "
+"vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:60
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:64
+msgid "It disables/enables the prompt while marking multiple messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:65
+msgid ""
+"It disables/enables the repeated prompts to ask if offline sync is required "
+"before going into offline mode."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:67
+msgid "Last time empty junk was run"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:68
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:69
+msgid "Level beyond which the message should be logged."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "List of Labels and their associated colors"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "List of accepted licenses"
+msgstr "د منل شويو منښليکونو لړ"
+
+#: ../mail/evolution-mail.schemas.in.h:72
+msgid "List of accounts"
+msgstr "د ګڼونونو لړ"
+
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid "List of custom headers and whether they are enabled."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:78
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:79
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net. 1 - Load images in messages from contacts. 2 - "
+"Always load images off the net."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:81
+msgid "Log filter actions"
+msgstr "د چاڼ چارونه خبرالول"
+
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:83
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:84
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:86
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:88
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid "Message Window default height"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid "Message Window default width"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:91
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:92
+msgid "Minimum days between emptying the junk on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:95
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:96
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:97
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:98
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:99
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:100
+msgid "Prompt to check if the user wants to go offline immediately"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:101
+msgid "Prompt when deleting messages in search folder"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Prompt when user tries to open 10 or more messages at once"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:105
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:106
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:107
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:108
+msgid "Prompt while marking multiple messages"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:109
+msgid "Recognize emoticons in text and replace them with images."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:111
+msgid "Run junk test on incoming mail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid "Save directory"
+msgstr "پوښۍ ساتل"
+
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Search for the sender photo in local addressbooks"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Send HTML mail by default"
+msgstr "ليک لېږل HTML په تلواله توګه"
+
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid "Send HTML mail by default."
+msgstr ".ليک لېږل HTML په تلواله توګه"
+
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid "Sender email-address column in the message list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid "Show Animations"
+msgstr "سېلنونه ښودل"
+
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Show animated images as animations."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:119
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:120
+msgid "Show deleted messages in the message-list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:121
+msgid "Show photo of the sender"
+msgstr "د استوونکي انځور ښودل"
+
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show the photo of the sender in the message reading pane."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Spell check inline"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Spell checking color"
+msgstr "د ليکدود کتنې رنګ"
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Spell checking languages"
+msgstr "د ليکدود کتنې ژبه"
+
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Subscribe dialog default height"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Terminal font"
+msgstr "پايالي ليکبڼه"
+
+#: ../mail/evolution-mail.schemas.in.h:132
+msgid "Text message part limit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:133
+msgid "The default plugin for Junk hook"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "The last time empty junk was run, in days since the epoch."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid "The terminal font for mail display."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid "The variable width font for mail display."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid ""
+"This decides the max size of the text part that can be formatted under "
+"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won't fall back "
+"to the other available plugins."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:141
+msgid ""
+"This key is read only once and reset to false after read. This unselects the "
+"mail in the list and removes the preview for that folder."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local addressbook only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:144
+msgid "This option would help in improving the speed of fetching."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:146
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:147
+msgid ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message's date. Evolution requires a "
+"restart."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:148
+msgid "Thread the message list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:149
+msgid "Thread the message-list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:150
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Time interval, in seconds, how often upload store changes to server."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:152
+msgid ""
+"Time interval, in seconds, how often upload store changes to server. The "
+"actual value cannot be less than 30 seconds."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid "Timeout for marking message as seen"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid "Timeout for marking message as seen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:155
+msgid "UID string of the default account."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "Use SpamAssassin daemon and client"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid "Use custom fonts"
+msgstr "دوديزې ليکبڼې کارول"
+
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid "Use custom fonts for displaying mail."
+msgstr ".د ليک ښودلو لپاره دوديزې ليکبڼې کارول"
+
+#: ../mail/evolution-mail.schemas.in.h:161
+msgid "Use only local spam tests."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:162
+msgid "Use only the local spam tests (no DNS)."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:163
+msgid "Use side-by-side or wide layout"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:164
+msgid "Variable width font"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:165
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:166
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:167
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:168
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:169
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:170
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:171
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:172
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:174
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:175
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:177
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:178
+msgid "Whether sort threads based on latest message in that thread"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid "Width of the message-list pane"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:180
+msgid "Width of the message-list pane."
+msgstr ""
+
+#: ../mail/importers/elm-importer.c:182
+msgid "Importing Elm data"
+msgstr ""
+
+#: ../mail/importers/elm-importer.c:367
+msgid "Evolution Elm importer"
+msgstr ""
+
+#: ../mail/importers/elm-importer.c:368
+msgid "Import mail from Elm."
+msgstr ""
+
+#: ../mail/importers/evolution-mbox-importer.c:80
+msgid "Destination folder:"
+msgstr ":موخه پوښۍ"
+
+#: ../mail/importers/evolution-mbox-importer.c:83
+msgid "Select folder to import into"
+msgstr ""
+
+#: ../mail/importers/evolution-mbox-importer.c:220
+msgid "Berkeley Mailbox (mbox)"
+msgstr ""
+
+#: ../mail/importers/evolution-mbox-importer.c:221
+msgid "Importer Berkeley Mailbox format folders"
+msgstr ""
+
+#: ../mail/importers/mail-importer.c:148
+msgid "Importing mailbox"
+msgstr ""
+
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
+#, c-format
+msgid "Importing `%s'"
+msgstr "دننول کيږي `%s'"
+
+#: ../mail/importers/mail-importer.c:372
+#, c-format
+msgid "Scanning %s"
+msgstr ""
+
+#: ../mail/importers/pine-importer.c:227
+msgid "Importing Pine data"
+msgstr "پاېن اومتوک دننول کيږي"
+
+#: ../mail/importers/pine-importer.c:426
+msgid "Evolution Pine importer"
+msgstr "اېوليوشن پاېن دننونکی"
+
+#: ../mail/importers/pine-importer.c:427
+msgid "Import mail from Pine."
+msgstr ".د پاېن نه ليک دننول"
+
+#: ../mail/mail-autofilter.c:79
+#, c-format
+msgid "Mail to %s"
+msgstr "ته ليکل %s"
+
+#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#, c-format
+msgid "Mail from %s"
+msgstr "%s ليک له"
+
+#: ../mail/mail-autofilter.c:266
+#, c-format
+msgid "Subject is %s"
+msgstr ""
+
+#: ../mail/mail-autofilter.c:301
+#, c-format
+msgid "%s mailing list"
+msgstr ""
+
+#: ../mail/mail-autofilter.c:372
+msgid "Add Filter Rule"
+msgstr "چاڼ دوی زياتول"
+
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#, fuzzy
+msgid "Templates"
+msgstr ":کونده"
+
+#: ../mail/mail-component.c:548
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "،ټاکل شوی %d"
+msgstr[1] "،ټاکل شوي %d"
+
+#: ../mail/mail-component.c:552
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "ړنګول شوی %d"
+msgstr[1] "ړنګول شوي %d"
+
+#: ../mail/mail-component.c:559
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "سرکودن %d"
+msgstr[1] "سرکودن %d"
+
+#: ../mail/mail-component.c:562
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "ګارليک %d"
+msgstr[1] "ګارليکونه %d"
+
+#: ../mail/mail-component.c:564
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "لېږل شوی %d"
+msgstr[1] "لېږل شوي %d"
+
+#: ../mail/mail-component.c:566
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "نالېږل شوی %d"
+msgstr[1] "نالېږل شوي %d"
+
+#: ../mail/mail-component.c:572
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "،نالوستی %d"
+msgstr[1] "،نالوستي %d"
+
+#: ../mail/mail-component.c:573
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "ټول %d"
+msgstr[1] "ټول %d"
+
+#: ../mail/mail-component.c:914
+msgid "New Mail Message"
+msgstr "نوې ليک استوزه"
+
+#: ../mail/mail-component.c:915
+msgid "_Mail Message"
+msgstr "ليک استوزه_"
+
+#: ../mail/mail-component.c:916
+msgid "Compose a new mail message"
+msgstr "نوې ليک استوزه ليکل"
+
+#: ../mail/mail-component.c:922
+msgid "New Mail Folder"
+msgstr "نوې ليک پوښۍ"
+
+#: ../mail/mail-component.c:923
+msgid "Mail _Folder"
+msgstr "ليک _پوښۍ"
+
+#: ../mail/mail-component.c:924
+msgid "Create a new mail folder"
+msgstr "نوې ليک پوښۍ جوړول"
+
+#: ../mail/mail-component.c:1071
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: ../mail/mail-component.c:1584
+msgid "Error"
+msgstr "تېروتنه"
+
+#: ../mail/mail-component.c:1584
+msgid "Errors"
+msgstr "تېروتنې"
+
+#: ../mail/mail-component.c:1585
+msgid "Warnings and Errors"
+msgstr "خبرتياوې او تېروتنې"
+
+#: ../mail/mail-component.c:1586
+msgid "Debug"
+msgstr "کړاوتمبول"
+
+#: ../mail/mail-component.c:1586
+msgid "Error, Warnings and Debug messages"
+msgstr "تېروتنې، خبرتياوې او کړاوتمبونې استوزې"
+
+#: ../mail/mail-component.c:1713
+msgid "Debug Logs"
+msgstr "کړاوتمبونې خبرال"
+
+#: ../mail/mail-component.c:1727
+msgid "Show _errors in the status bar for"
+msgstr ""
+
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1743
+msgid "second(s)."
+msgstr "سېکېنډ(ه)"
+
+#: ../mail/mail-component.c:1749
+msgid "Log Messages:"
+msgstr ":خبرال استوزې"
+
+#: ../mail/mail-component.c:1790
+msgid "Log Level"
+msgstr "خبرال کچ"
+
+#: ../mail/mail-component.c:1799 ../widgets/misc/e-dateedit.c:395
+msgid "Time"
+msgstr "مهال"
+
+#: ../mail/mail-component.c:1809 ../mail/message-list.c:2430
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "استوزې"
+
+#: ../mail/mail-component.c:1818 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "دا کړکۍ بندول"
+
+#: ../mail/mail-config.glade.h:1
+msgid " Ch_eck for Supported Types "
+msgstr "د منلو ډولونو لپاره ک_تل"
+
+#: ../mail/mail-config.glade.h:2
+msgid "(Note: Requires restart of the application)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:4
+msgid "<b>SSL is not supported in this build of Evolution</b>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:5
+msgid "<b>Sender Photograph</b>"
+msgstr "<b>د استوونکي انځور</b>"
+
+#: ../mail/mail-config.glade.h:6
+msgid "<b>Sig_natures</b>"
+msgstr "<b>لاس_ليکونه</b>"
+
+#: ../mail/mail-config.glade.h:7
+msgid "<b>Top Posting Option</b> (Not Recommended)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:8
+msgid "<b>_Languages</b>"
+msgstr "<b>ژبې_</b>"
+
+#: ../mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Account Information</span>"
+msgstr "<span weight=\"bold\">ګڼون خبرتياوې</span>"
+
+#: ../mail/mail-config.glade.h:11
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr "<span weight=\"bold\">کرونه</span>"
+
+#: ../mail/mail-config.glade.h:12
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr "<span weight=\"bold\">استوزې ليکل</span>"
+
+#: ../mail/mail-config.glade.h:13
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr "<span weight=\"bold\">سازونه</span>"
+
+#: ../mail/mail-config.glade.h:14
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr "<span weight=\"bold\">ليک ړنګول</span>"
+
+#: ../mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+msgstr "<span weight=\"bold\">ښکارېدلې استوزه _سريزې</span>"
+
+#: ../mail/mail-config.glade.h:18
+msgid "<span weight=\"bold\">Labels</span>"
+msgstr "<span weight=\"bold\">نښکې</span>"
+
+#: ../mail/mail-config.glade.h:19
+msgid "<span weight=\"bold\">Loading Images</span>"
+msgstr "<span weight=\"bold\">انځورونه لېښل کيږي</span>"
+
+#: ../mail/mail-config.glade.h:20
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr "<span weight=\"bold\">د استوزې ښوون</span>"
+
+#: ../mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Message Fonts</span>"
+msgstr "<span weight=\"bold\">استوزه ليکبڼې</span>"
+
+#: ../mail/mail-config.glade.h:22
+msgid "<span weight=\"bold\">Message Receipts</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:3
+msgid "<span weight=\"bold\">Optional Information</span>"
+msgstr "<span weight=\"bold\">غوراويزې خبرتياوې</span>"
+
+#: ../mail/mail-config.glade.h:24
+msgid "<span weight=\"bold\">Options</span>"
+msgstr "<span weight=\"bold\">غوراوي</span>"
+
+#: ../mail/mail-config.glade.h:25
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:26
+msgid "<span weight=\"bold\">Printed Fonts</span>"
+msgstr "<span weight=\"bold\">چاپ شوې ليکبڼې</span>"
+
+#: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">د ګوډاګي امستنې</span>"
+
+#: ../mail/mail-config.glade.h:28
+msgid "<span weight=\"bold\">Required Information</span>"
+msgstr "<span weight=\"bold\">اړينې خبرتياوې</span>"
+
+#: ../mail/mail-config.glade.h:29
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:30
+msgid "<span weight=\"bold\">Security</span>"
+msgstr "<span weight=\"bold\">خونديتوب</span>"
+
+#: ../mail/mail-config.glade.h:31
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+msgstr "<span weight=\"bold\">لېږل شوې او ګارليک استوزې</span>"
+
+#: ../mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr "<span weight=\"bold\">د پالنګر سازونه</span>"
+
+#: ../mail/mail-config.glade.h:33
+msgid "<span weight=\"bold\">_Authentication Type</span>"
+msgstr "<span weight=\"bold\">د کرونې ډول_</span>"
+
+#: ../mail/mail-config.glade.h:35
+msgid "Account Management"
+msgstr "ګڼون سمبالونه"
+
+#: ../mail/mail-config.glade.h:36
+msgid "Add Ne_w Signature..."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:37
+msgid "Add _Script"
+msgstr "سکرېپټ _زياتول"
+
+#: ../mail/mail-config.glade.h:38
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:39
+msgid "Also encrypt to sel_f when sending encrypted messages"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:40
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:41
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:42
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:43
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:44
+msgid "Always request rea_d receipt"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:46
+msgid "Automatically insert _emoticon images"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:47
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:48
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:49
+msgid "C_haracter set:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:50
+msgid "Ch_eck for Supported Types "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:51
+msgid "Check cu_stom headers for junk"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:52
+msgid "Check incoming _messages for junk"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:53
+msgid "Check spelling while I _type"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:54
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:55
+msgid "Cle_ar"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:56
+msgid "Clea_r"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:57
+msgid "Color for _misspelled words:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:58
+msgid "Confirm _when expunging a folder"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:59
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:65
+msgid "De_fault"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:66
+msgid "Default character e_ncoding:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:68
+msgid "Delete junk messages on e_xit"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:70
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:71
+msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:72
+msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:73
+msgid "Do not quote"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:74
+msgid "Done"
+msgstr "وشو"
+
+#: ../mail/mail-config.glade.h:75
+msgid "Drafts _Folder:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:76
+msgid "Email Accounts"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:77
+msgid "Email _Address:"
+msgstr ":برېښليک _پته"
+
+#: ../mail/mail-config.glade.h:78
+msgid "Empty trash folders on e_xit"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:79
+msgid "Enable Magic S_pacebar "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:80
+msgid "Enable Sea_rch Folders"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:81
+msgid "Encry_ption certificate:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:82
+msgid "Encrypt out_going messages (by default)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:84
+msgid "Fi_xed-width:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:85
+msgid "Fix_ed width Font:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:86
+msgid "Font Properties"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:87
+msgid "Format messages in _HTML"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:88
+msgid "Full Nam_e:"
+msgstr ":بشپړ نو_م"
+
+#: ../mail/mail-config.glade.h:90
+msgid "HTML Messages"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:92
+msgid "Headers"
+msgstr "سريزې"
+
+#: ../mail/mail-config.glade.h:93
+msgid "Highlight _quotations with"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:95
+msgid "Inline"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:98
+msgid "KB"
+msgstr "ک ب"
+
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
+msgid "Labels"
+msgstr "نښکې"
+
+#: ../mail/mail-config.glade.h:100
+msgid "Languages Table"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:101
+msgid "Mail Configuration"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:102
+msgid "Mail Headers Table"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:104
+msgid "Mailbox location"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:105
+msgid "Message Composer"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:107
+msgid ""
+"Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:108
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:109
+msgid "Or_ganization:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:110
+msgid "PGP/GPG _Key ID:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:111
+msgid "Pass_word:"
+msgstr ":تېرن_ويې"
+
+#: ../mail/mail-config.glade.h:113
+msgid ""
+"Please enter a descriptive name for this account in the space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:115
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:116
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:117
+msgid "Please select among the following options"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:118
+msgid "Port:"
+msgstr ":درشل"
+
+#: ../mail/mail-config.glade.h:119
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:120
+msgid "Quoted"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:121
+msgid "Re_member password"
+msgstr "تېرنويې په ي_اد ساتل"
+
+#: ../mail/mail-config.glade.h:122
+msgid "Re_ply-To:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:124
+msgid "Remember _password"
+msgstr "تېرنويې په ياد _ساتل"
+
+#: ../mail/mail-config.glade.h:125
+msgid "S_OCKS Host:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:126
+msgid "S_earch for sender photograph only in local addressbooks"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:127
+msgid "S_elect..."
+msgstr "...ټ_اکل"
+
+#: ../mail/mail-config.glade.h:128
+msgid "S_end message receipts:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:129
+msgid "S_tandard Font:"
+msgstr ":ا_ره ليکبڼه"
+
+#: ../mail/mail-config.glade.h:131
+msgid "Select HTML fixed width font"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:132
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:133
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:134
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:136
+msgid "Sending Mail"
+msgstr "ليک استول کيږي"
+
+#: ../mail/mail-config.glade.h:137
+msgid "Sent _Messages Folder:"
+msgstr ":د لېږل شوېو _استوزو پوښۍ"
+
+#: ../mail/mail-config.glade.h:138
+msgid "Ser_ver requires authentication"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:139
+msgid "Server _Type: "
+msgstr ":د پالنګر _ډول"
+
+#: ../mail/mail-config.glade.h:140
+msgid "Sig_ning certificate:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:141
+msgid "Signat_ure:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:142
+msgid "Signatures"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:143
+msgid "Signatures Table"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:144
+msgid "Spell Checking"
+msgstr "ليکدود کتنه"
+
+#: ../mail/mail-config.glade.h:145
+msgid "Start _typing at the bottom on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:146
+msgid "T_ype: "
+msgstr ":ډ_ول"
+
+#: ../mail/mail-config.glade.h:147
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:148
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:151
+msgid ""
+"This option will be overridden if a match for custom junk headers is found."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:152
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+
+#: ../mail/mail-config.glade.h:154
+msgid "Us_ername:"
+msgstr ":کا_رننوم"
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "کرو_نه کارول"
+
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:364
+msgid "User_name:"
+msgstr ":کارن_نوم"
+
+#: ../mail/mail-config.glade.h:157
+msgid "V_ariable-width:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:158
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin. "
+msgstr ""
+".د اېوليوشن ليک سازونې مرستيال ته ښه راغلاست\n"
+"\n"
+".کېکاږﺉ \"Forward\" د پېلولو لپاره"
+
+#: ../mail/mail-config.glade.h:161
+msgid "_Add Signature"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:162
+msgid "_Always load images from the Internet"
+msgstr "تل د اېنټرنېټ نه انځورونه لېښل_"
+
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:164
+msgid "_Default junk plugin:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "اېنټرنېټ سره سيده نښلېدنه_"
+
+#: ../mail/mail-config.glade.h:166
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:168
+msgid "_Forward style:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:169
+msgid "_Keep Signature above the original message on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:170
+msgid "_Load images in messages from contacts"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local addressbook only"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:172
+msgid "_Make this my default account"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:174
+msgid "_Mark messages as read after"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:176
+msgid "_Never load images from the Internet"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:177
+msgid "_Path:"
+msgstr ":يونلور_"
+
+#: ../mail/mail-config.glade.h:178
+msgid "_Prompt when sending HTML messages to contacts that do not want them"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:179
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:180
+msgid "_Reply style:"
+msgstr ":د ځواب ډول_"
+
+#: ../mail/mail-config.glade.h:181
+msgid "_Script:"
+msgstr ":سکرېپټ_"
+
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:183
+msgid "_Select..."
+msgstr "...ټاکل_"
+
+#. If enabled, show animation; if disabled, only display a static image without any animation
+#: ../mail/mail-config.glade.h:186
+msgid "_Show image animations"
+msgstr "انځور سېلنونه ښودل_"
+
+#: ../mail/mail-config.glade.h:187
+msgid "_Show the photograph of sender in the message preview"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:188
+msgid "_Shrink To / Cc / Bcc headers to "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:189
+msgid "_Use Secure Connection:"
+msgstr "خوندي نښلېدنه کارول_"
+
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "د غونډال تلوالې کارول_"
+
+#: ../mail/mail-config.glade.h:191
+msgid "_Use the same fonts as other applications"
+msgstr "د نورو کاريالونو غوندې هماغه ليکبڼې کارول_"
+
+#: ../mail/mail-config.glade.h:192
+msgid "addresses"
+msgstr "پتې"
+
+#: ../mail/mail-config.glade.h:193
+msgid "color"
+msgstr "رنګ"
+
+#: ../mail/mail-config.glade.h:194
+msgid "description"
+msgstr "سپړاوی"
+
+#: ../mail/mail-dialogs.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../mail/mail-dialogs.glade.h:2
+msgid "<b>Search Folder Sources</b>"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:3
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:4
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">کوډه کښنه</span>"
+
+#: ../mail/mail-dialogs.glade.h:5
+msgid "All active remote folders"
+msgstr "ټولې چارنده لرې پوښۍ"
+
+#: ../mail/mail-dialogs.glade.h:6
+msgid "All local and active remote folders"
+msgstr "ټولې ځاييزې او چارنده لرې پوښۍ"
+
+#: ../mail/mail-dialogs.glade.h:7
+msgid "All local folders"
+msgstr "ټولې ځاييزې پوښۍ"
+
+#: ../mail/mail-dialogs.glade.h:8
+msgid "Case _sensitive"
+msgstr "کېس _انګېره"
+
+#: ../mail/mail-dialogs.glade.h:9
+msgid "Co_mpleted"
+msgstr "بش_پړ شوی"
+
+#: ../mail/mail-dialogs.glade.h:11
+msgid "F_ind:"
+msgstr ":ل_ټول"
+
+#: ../mail/mail-dialogs.glade.h:12
+msgid "Find in Message"
+msgstr "په استوزه کې لټول"
+
+#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:279
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:14
+msgid "Folder Subscriptions"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:15
+msgid "License Agreement"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:16
+msgid "None Selected"
+msgstr "هېڅ نه دي ټاکل شوي"
+
+#: ../mail/mail-dialogs.glade.h:17
+msgid "S_erver:"
+msgstr ":پ_النګر"
+
+#: ../mail/mail-dialogs.glade.h:18
+msgid "Security Information"
+msgstr "د خونديتوب خبرتياوې"
+
+#: ../mail/mail-dialogs.glade.h:19
+msgid "Specific folders"
+msgstr "ځانګړې پوښۍ"
+
+#: ../mail/mail-dialogs.glade.h:21
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:23
+msgid "_Accept License"
+msgstr "منښتليک منل_"
+
+#: ../mail/mail-dialogs.glade.h:24
+msgid "_Due By:"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:25
+msgid "_Flag:"
+msgstr ":جنډه_"
+
+#: ../mail/mail-dialogs.glade.h:26
+msgid "_Tick this to accept the license agreement"
+msgstr ""
+
+#: ../mail/mail-folder-cache.c:832
+#, c-format
+msgid "Pinging %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:105
+msgid "Filtering Selected Messages"
+msgstr ""
+
+#: ../mail/mail-ops.c:264
+msgid "Fetching Mail"
+msgstr ""
+
+#. sending mail, filtering failed
+#: ../mail/mail-ops.c:560
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+msgstr ""
+
+#: ../mail/mail-ops.c:618
+#, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:724
+msgid "Sending message"
+msgstr "استوزه لېږل کيږي"
+
+#: ../mail/mail-ops.c:734
+#, c-format
+msgid "Sending message %d of %d"
+msgstr ""
+
+#: ../mail/mail-ops.c:761
+#, c-format
+msgid "Failed to send %d of %d messages"
+msgstr ""
+
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
+msgid "Canceled."
+msgstr ".بند شو"
+
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
+msgid "Complete."
+msgstr ".بشپړ"
+
+#: ../mail/mail-ops.c:869
+msgid "Saving message to folder"
+msgstr "پوښۍ کې استوزه ساتل کيږي"
+
+#: ../mail/mail-ops.c:947
+#, c-format
+msgid "Moving messages to %s"
+msgstr "ته استوزه خوځول کيږي %s"
+
+#: ../mail/mail-ops.c:947
+#, c-format
+msgid "Copying messages to %s"
+msgstr "ته استوزه لمېسل کيږي %s"
+
+#: ../mail/mail-ops.c:1164
+msgid "Forwarded messages"
+msgstr "استوزې مخکې کول کيږي"
+
+#: ../mail/mail-ops.c:1205
+#, c-format
+msgid "Opening folder %s"
+msgstr "پوښۍ پرانيستل کيږي %s"
+
+#: ../mail/mail-ops.c:1270
+#, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:1339
+#, c-format
+msgid "Opening store %s"
+msgstr "زېرمه پرانيستل کيږي %s"
+
+#: ../mail/mail-ops.c:1410
+#, c-format
+msgid "Removing folder %s"
+msgstr "پوښۍ ړنګول کيږي %s"
+
+#: ../mail/mail-ops.c:1499
+#, c-format
+msgid "Storing folder '%s'"
+msgstr "پوښۍ زېرمل کيږي %s"
+
+#: ../mail/mail-ops.c:1562
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1563
+#, c-format
+msgid "Storing account '%s'"
+msgstr "ګڼون زېرمل کيږي '%s'"
+
+#: ../mail/mail-ops.c:1617
+msgid "Refreshing folder"
+msgstr "پوښۍ تاندول کيږي"
+
+#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
+msgid "Expunging folder"
+msgstr ""
+
+#: ../mail/mail-ops.c:1704
+#, c-format
+msgid "Emptying trash in '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1705
+msgid "Local Folders"
+msgstr "ځاييزې پوښۍ"
+
+#: ../mail/mail-ops.c:1786
+#, c-format
+msgid "Retrieving message %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:1893
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-ops.c:1978
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-ops.c:2056
+#, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2128
+msgid "Saving attachment"
+msgstr "نښلن ساتل کيږي"
+
+#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
+#, c-format
+msgid ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2169
+#, c-format
+msgid "Could not write data: %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2315
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2315
+#, c-format
+msgid "Reconnecting to %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2411
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr ""
+
+#: ../mail/mail-ops.c:2497
+msgid "Checking Service"
+msgstr "پالنه کتل کيږي"
+
+#: ../mail/mail-send-recv.c:182
+msgid "Canceling..."
+msgstr "...بندول کيږي"
+
+#: ../mail/mail-send-recv.c:385
+msgid "Send & Receive Mail"
+msgstr "ليک لېږل او راوستل"
+
+#: ../mail/mail-send-recv.c:396
+msgid "Cancel _All"
+msgstr "ټول _بندول"
+
+#: ../mail/mail-send-recv.c:505
+msgid "Updating..."
+msgstr "...اوسمهالول کيږي"
+
+#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
+msgid "Waiting..."
+msgstr "...تمه کيږي"
+
+#: ../mail/mail-send-recv.c:806
+#, c-format
+msgid "Checking for new mail"
+msgstr "د نوي ليک لپاره کتل کيږي"
+
+#: ../mail/mail-session.c:205
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr ""
+
+#: ../mail/mail-session.c:207
+msgid "Enter Passphrase"
+msgstr ""
+
+#: ../mail/mail-session.c:210
+#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#, c-format
+msgid "Enter Password for %s"
+msgstr ""
+
+#: ../mail/mail-session.c:212
+msgid "Enter Password"
+msgstr "تېرنويې وليکئ"
+
+#: ../mail/mail-session.c:254
+msgid "User canceled operation."
+msgstr ""
+
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "ساتل او بندول_"
+
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "لاسليک سمول"
+
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr ""
+
+#: ../mail/mail-tools.c:120
+#, c-format
+msgid "Could not create spool directory `%s': %s"
+msgstr ""
+
+#: ../mail/mail-tools.c:150
+#, c-format
+msgid "Trying to movemail a non-mbox source `%s'"
+msgstr ""
+
+#: ../mail/mail-tools.c:256
+#, c-format
+msgid "Forwarded message - %s"
+msgstr ""
+
+#: ../mail/mail-tools.c:258
+msgid "Forwarded message"
+msgstr ""
+
+#: ../mail/mail-tools.c:298
+#, c-format
+msgid "Invalid folder: `%s'"
+msgstr ""
+
+#: ../mail/mail-vfolder.c:89
+#, c-format
+msgid "Setting up Search Folder: %s"
+msgstr ""
+
+#: ../mail/mail-vfolder.c:233
+#, c-format
+msgid "Updating Search Folders for '%s:%s'"
+msgstr ""
+
+#: ../mail/mail-vfolder.c:240
+#, c-format
+msgid "Updating Search Folders for '%s'"
+msgstr ""
+
+#: ../mail/mail-vfolder.c:1066
+msgid "Edit Search Folder"
+msgstr "پلټون پوښۍ سمول"
+
+#: ../mail/mail-vfolder.c:1155
+msgid "New Search Folder"
+msgstr "نوې پلټون پوښۍ"
+
+#: ../mail/mail.error.xml.h:1
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:2
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:3
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:6
+msgid ""
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:7
+msgid ""
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:8
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:9
+msgid "Are you sure you want to delete this account and all its proxies?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:10
+msgid "Are you sure you want to delete this account?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:11
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:12
+msgid "Are you sure you want to open {0} messages at once?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:13
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:14
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:15
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:16
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:17
+msgid "Are you sure you want to send a message without a subject?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:18
+msgid "Because \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:20
+msgid "Because \"{2}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:21
+msgid "Blank Signature"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:22
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:23
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:24
+msgid "Cannot create folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:25
+msgid "Cannot create temporary save directory."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:26
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr ""
+
+#: ../mail/mail.error.xml.h:27
+msgid "Cannot delete folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:28
+msgid "Cannot delete system folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:29
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:30
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:31
+msgid "Cannot open source \"{1}\""
+msgstr ""
+
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{2}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:33
+msgid "Cannot open target \"{2}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:34
+msgid ""
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:35
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:36
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:37
+msgid "Cannot save changes to account."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:38
+msgid "Cannot save to directory \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:39
+msgid "Cannot save to file \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:40
+msgid "Cannot set signature script \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:41
+msgid "Check Junk Failed"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:42
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:43
+msgid "Could not save signature file."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:44
+msgid "Delete \"{0}\"?"
+msgstr "ړنګول غواړﺉ؟ ‎\"{0}\""
+
+#: ../mail/mail.error.xml.h:45
+msgid "Delete account?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:47
+msgid "Delete messages in Search Folder?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:48
+msgid "Discard changes?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:49
+msgid "Do not d_elete"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:50
+msgid "Do not delete"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:51
+msgid "Do not disable"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:52
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:53
+msgid "Do you want to mark all messages as read?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:54
+msgid "Do you wish to save your changes?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:55
+msgid "Enter password."
+msgstr ".تېرنويې وليکئ"
+
+#: ../mail/mail.error.xml.h:56
+msgid "Error loading filter definitions."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:57
+msgid "Error while performing operation."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:58
+msgid "Error while {0}."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:59
+msgid "File exists but cannot overwrite it."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:60
+msgid "File exists but is not a regular file."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:61
+msgid "If you continue, you will not be able to recover these messages."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:62
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:63
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:64
+msgid ""
+"If you proceed, the account information and\n"
+"all proxy information will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:66
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:67
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:68
+msgid "Ignore"
+msgstr "پرېښودل"
+
+#: ../mail/mail.error.xml.h:69
+msgid "Invalid authentication"
+msgstr "ناسمه کرونه"
+
+#: ../mail/mail.error.xml.h:71
+msgid "Mail filters automatically updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:72
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:73
+msgid "Mark all messages as read"
+msgstr "ټولې استوزې لکه لوستې نښول"
+
+#: ../mail/mail.error.xml.h:74
+msgid "Missing folder."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:76
+msgid "No sources selected."
+msgstr ".کومې سرچينې نه دي ټاکل شوي"
+
+#: ../mail/mail.error.xml.h:77
+msgid "Opening too many messages at once may take a long time."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:78
+msgid "Please check your account settings and try again."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:79
+msgid "Please enable the account or send using another account."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:80
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:81
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:83
+msgid "Please provide an unique name to identify this signature."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:84
+msgid "Please wait."
+msgstr ".لږه تمه وکړﺉ"
+
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:86
+msgid "Querying server"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:87
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:88
+msgid "Read receipt requested."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:90
+msgid "Report Junk Failed"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:91
+msgid "Report Not Junk Failed"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:92
+msgid "Search Folders automatically updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:93
+msgid "Send Receipt"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:94
+msgid "Signature Already Exists"
+msgstr "لاسليک د مخکې نه شتون لري"
+
+#: ../mail/mail.error.xml.h:95
+msgid "Synchronize"
+msgstr "هممهالیزول"
+
+#: ../mail/mail.error.xml.h:96
+msgid "Synchronize folders locally for offline usage?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:97
+msgid ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:98
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
+msgstr ""
+
+#: ../mail/mail.error.xml.h:101
+msgid ""
+"The following Search Folder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:106
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:111
+msgid "The script file must exist and be executable."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:112
+msgid ""
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:114
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:115
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:116
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:117
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:118
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:119
+msgid "Unable to connect to the GroupWise server."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:120
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:121
+msgid "Unable to read license file."
+msgstr ".منښتليک دوتنه نه شي لوستلی"
+
+#: ../mail/mail.error.xml.h:122
+msgid "Use _Default"
+msgstr "تلواله _کارول"
+
+#: ../mail/mail.error.xml.h:123
+msgid "Use default drafts folder?"
+msgstr "تلواله ګارليک پوښۍ کارول غواړﺉ؟"
+
+#: ../mail/mail.error.xml.h:124
+msgid ""
+"Warning: Deleting messages from a Search Folder will delete the actual "
+"message from one of your local or remote folders.\n"
+"Do you really want to do this?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:127
+msgid "You have not filled in all of the required information."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:128
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:129
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:130
+msgid "You must name this Search Folder."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:131
+msgid "You must specify a folder."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:132
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:134
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:135
+msgid "_Append"
+msgstr "پاېملون_"
+
+#: ../mail/mail.error.xml.h:136
+msgid "_Discard changes"
+msgstr "بدلونونه نه منل_"
+
+#: ../mail/mail.error.xml.h:137
+msgid "_Do not Synchronize"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:139
+msgid "_Expunge"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:140
+msgid "_Open Messages"
+msgstr "استوزې پرانيستل_"
+
+#: ../mail/message-list.c:1051
+msgid "Unseen"
+msgstr "ناکتلی"
+
+#: ../mail/message-list.c:1052
+msgid "Seen"
+msgstr "کتلی"
+
+#: ../mail/message-list.c:1053
+msgid "Answered"
+msgstr "ځواب شوي"
+
+#: ../mail/message-list.c:1054
+msgid "Forwarded"
+msgstr "مخکې شوی"
+
+#: ../mail/message-list.c:1055
+msgid "Multiple Unseen Messages"
+msgstr "ګڼې ناکتلې استوزې"
+
+#: ../mail/message-list.c:1056
+msgid "Multiple Messages"
+msgstr "ګڼې استوزې"
+
+#: ../mail/message-list.c:1060
+msgid "Lowest"
+msgstr "ټولوټيټ"
+
+#: ../mail/message-list.c:1061
+msgid "Lower"
+msgstr "کوز"
+
+#: ../mail/message-list.c:1065
+msgid "Higher"
+msgstr "جګ"
+
+#: ../mail/message-list.c:1066
+msgid "Highest"
+msgstr "ټولوجګ"
+
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
+msgid "?"
+msgstr "؟"
+
+#. strftime format of a time,
+#. in 12-hour format, without seconds.
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
+#: ../widgets/table/e-cell-date.c:70
+msgid "Today %l:%M %p"
+msgstr "%l:%M %p نن"
+
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
+msgid "Yesterday %l:%M %p"
+msgstr "%l:%M %p پرون"
+
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
+msgid "%a %l:%M %p"
+msgstr "%a %l:%M %p"
+
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
+msgid "%b %d %Y"
+msgstr "%b %d %Y"
+
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3885 ../mail/message-list.c:4321
+msgid "Generating message list"
+msgstr "استوزه لړ جوړول کيږي"
+
+#: ../mail/message-list.c:4176
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4178
+msgid "There are no messages in this folder."
+msgstr ".په دې پوښۍ کې کومې استوزې نه شته"
+
+#: ../mail/message-list.etspec.h:3
+msgid "Due By"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:4
+msgid "Flag Status"
+msgstr "جنډه انکړ"
+
+#: ../mail/message-list.etspec.h:5
+msgid "Flagged"
+msgstr "جنډه شوی"
+
+#: ../mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:11
+msgid "Received"
+msgstr "ترلاسه شوي"
+
+#: ../mail/message-list.etspec.h:15
+msgid "Sent Messages"
+msgstr "لېږل شوې استوزې"
+
+#: ../mail/message-list.etspec.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+msgid "Size"
+msgstr "کچ"
+
+#: ../mail/message-tag-followup.c:56
+msgid "Call"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:57
+msgid "Do Not Forward"
+msgstr "نه مخکې کول"
+
+#: ../mail/message-tag-followup.c:58
+msgid "Follow-Up"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:59
+msgid "For Your Information"
+msgstr "ستاسو د خبرتياو لپاره"
+
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
+msgid "Forward"
+msgstr "مخکې"
+
+#: ../mail/message-tag-followup.c:61
+msgid "No Response Necessary"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
+msgid "Reply"
+msgstr "ځوابول"
+
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
+msgid "Reply to All"
+msgstr "ټول ځوابول"
+
+#: ../mail/message-tag-followup.c:66
+msgid "Review"
+msgstr "بياليد"
+
+#: ../mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "تنه لري"
+
+#: ../mail/searchtypes.xml.h:2
+msgid "Message contains"
+msgstr "استوزه لري"
+
+#: ../mail/searchtypes.xml.h:3
+msgid "Recipients contain"
+msgstr "نيووني لري"
+
+#: ../mail/searchtypes.xml.h:4
+msgid "Sender contains"
+msgstr "استوونی لري"
+
+#: ../mail/searchtypes.xml.h:5
+msgid "Subject contains"
+msgstr "سرليک لري"
+
+#: ../mail/searchtypes.xml.h:6
+msgid "Subject or Sender contains"
+msgstr "سرليک يا استوونی لري"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+msgid "Local Address Books"
+msgstr "ځاييز پته کتابونه\t"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Provides core functionality for local address books."
+msgstr ""
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr ""
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
+msgid "Keywords"
+msgstr "اروييونه"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid "Attachment Reminder"
+msgstr "نښلن رايادوونکی"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid ""
+"Looks for clues in a message for mention of attachments and warns if the "
+"attachment is missing"
+msgstr ""
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr ""
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+msgid "Message has no attachments"
+msgstr "استوزه نښلنونه نه لري"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
+msgstr "استوزه سمول_"
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+msgid ""
+"A formatter plugin which displays audio attachments inline and allows you to "
+"play them directly from evolution."
+msgstr ""
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+msgid "Audio inline plugin"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:107
+msgid "Select name of the Evolution backup file"
+msgstr "د اېوليوشن شاتړ دوتنې نوم وټاکئ"
+
+#: ../plugins/backup-restore/backup-restore.c:136
+msgid "_Restart Evolution after backup"
+msgstr "د شاتړ نه وروسته اېوليوشن بياپېلول_"
+
+#: ../plugins/backup-restore/backup-restore.c:159
+msgid "Select name of the Evolution backup file to restore"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:183
+msgid "_Restart Evolution after restore"
+msgstr "د بيازېرملو نه وروسته اېوليوشن بياپېلول_"
+
+#: ../plugins/backup-restore/backup-restore.c:256
+msgid "Restore from backup"
+msgstr "له شاتړه بيازېرمل"
+
+#: ../plugins/backup-restore/backup-restore.c:258
+msgid ""
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. \n"
+"It also restores all your personal settings, mail filters etc."
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:264
+msgid "_Restore Evolution from the backup file"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:271
+msgid "Please select an Evolution Archive to restore:"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:274
+msgid "Choose a file to restore"
+msgstr "د بيازېرملو لپاره يوه دوتنه وټاکئ"
+
+#: ../plugins/backup-restore/backup.c:46
+msgid "Backup Evolution directory"
+msgstr "د اېوليوشن پوښۍ شاتړول"
+
+#: ../plugins/backup-restore/backup.c:48
+msgid "Restore Evolution directory"
+msgstr "د اېوليوشن پوښۍ بيازېرمل"
+
+#: ../plugins/backup-restore/backup.c:50
+msgid "Check Evolution Backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:52
+msgid "Restart Evolution"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:54
+msgid "With Graphical User Interface"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
+msgid "Shutting down Evolution"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:112
+msgid "Backing Evolution accounts and settings"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:116
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:127
+msgid "Backup complete"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
+msgid "Restarting Evolution"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:242
+msgid "Backup current Evolution data"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:247
+msgid "Extracting files from backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:254
+msgid "Loading Evolution settings"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:258
+msgid "Removing temporary backup files"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:435
+#, c-format
+msgid "Backing up to the folder %s"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:440
+#, c-format
+msgid "Restoring from the folder %s"
+msgstr ""
+
+#. Backup / Restore only can have GUI. We should restrict the rest
+#: ../plugins/backup-restore/backup.c:459
+msgid "Evolution Backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:459
+msgid "Evolution Restore"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:494
+msgid "Backing up Evolution Data"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:497
+msgid "Restoring Evolution Data"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:516
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
+msgid "A plugin for backing up and restore Evolution data and settings."
+msgstr ""
+
+#. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+msgid "Backup and restore plugin"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Are you sure you want to close Evolution?"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid ""
+"Evolution backup can start only when Evolution is not running. Please make "
+"sure that you save and close all your unsaved windows before proceeding.  If "
+"you want Evolution to restart automatically after backup, please enable the "
+"toggle button."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Insufficient Permissions"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Invalid Evolution backup file"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid "Please select a valid backup file to restore."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "The selected folder does not have enough permissions to create the file"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid ""
+"This will delete all your current Evolution data and settings and restore "
+"them from your backup. Evolution restore can start only when Evolution is "
+"not running. Please make sure that you close all your unsaved windows before "
+"you proceed. If you want Evolution to restart automatically restart after "
+"restore, please enable the toggle button."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+msgid "Backup and restore Evolution data and settings"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+msgid "R_estore Settings..."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+msgid "_Backup Settings..."
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+msgid "Automatic Contacts"
+msgstr ""
+
+#. Enable BBDB checkbox
+#: ../plugins/bbdb/bbdb.c:565
+msgid ""
+"_Automatically create entries in the addressbook when responding to messages"
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:571
+msgid "Select Address book for Automatic Contacts"
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:586
+msgid "Instant Messaging Contacts"
+msgstr ""
+
+#. Enable Gaim Checkbox
+#: ../plugins/bbdb/bbdb.c:601
+msgid ""
+"Periodically synchronize contact information and images from Pidgin buddy "
+"list"
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:607
+msgid "Select Address book for Pidgin buddy list"
+msgstr ""
+
+#. Synchronize now button.
+#: ../plugins/bbdb/bbdb.c:618
+msgid "Synchronize with _buddy list now"
+msgstr ""
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid ""
+"Automatically fills your addressbook with names and email addresses as you "
+"reply to messages. Also fills in IM contact information from your buddy "
+"lists."
+msgstr ""
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+msgid "BBDB"
+msgstr ""
+
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
+msgid "Convert message text to _Unicode"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
+msgid "Bogofilter Options"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
+msgid "Filters junk messages using Bogofilter."
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+msgid "CalDAV"
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:126
+msgid "_URL:"
+msgstr ":URL_"
+
+#: ../plugins/caldav/caldav-source.c:269
+#: ../plugins/google-account-setup/google-source.c:357
+msgid "Use _SSL"
+msgstr ""
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "CalDAV Calendar sources"
+msgstr ""
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV sources"
+msgstr ""
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
+msgid "Local Calendars"
+msgstr ""
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Provides core functionality for local calendars."
+msgstr ""
+
+#: ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:546
+#: ../plugins/google-account-setup/google-source.c:381
+msgid "Re_fresh:"
+msgstr ""
+
+#: ../plugins/calendar-http/calendar-http.c:332
+msgid "_Secure connection"
+msgstr ""
+
+#: ../plugins/calendar-http/calendar-http.c:397
+msgid "Userna_me:"
+msgstr ""
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
+msgid "HTTP Calendars"
+msgstr ""
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+msgid "Provides core functionality for webcal and http calendars."
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:54
+#: ../plugins/calendar-weather/calendar-weather.c:60
+msgid "Weather: Cloudy"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:61
+msgid "Weather: Fog"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:62
+msgid "Weather: Partly Cloudy"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:63
+msgid "Weather: Rain"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:64
+msgid "Weather: Snow"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Sunny"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
+msgid "Weather: Thunderstorms"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:267
+msgid "Select a location"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:652
+msgid "_Units:"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:659
+msgid "Metric (Celsius, cm, etc)"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:660
+msgid "Imperial (Fahrenheit, inches, etc)"
+msgstr ""
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
+msgid "Provides core functionality for weather calendars."
+msgstr ""
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
+msgid "Weather Calendars"
+msgstr ""
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
+msgid ""
+"A test plugin which demonstrates a popup menu plugin which lets you copy "
+"things to the clipboard."
+msgstr ""
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
+msgid "Copy tool"
+msgstr ""
+
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr ""
+
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
+msgid "Checks whether Evolution is the default mail client on startup."
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
+msgid "Default Mail Client "
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
+msgid "Do you want to make Evolution your default e-mail client?"
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:679
+msgid "Evolution"
+msgstr ""
+
+#: ../plugins/default-source/default-source.c:81
+msgid "Mark as _default address book"
+msgstr ""
+
+#: ../plugins/default-source/default-source.c:102
+msgid "Mark as _default calendar"
+msgstr ""
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default task list"
+msgstr ""
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default memo list"
+msgstr ""
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+msgid "Default Sources"
+msgstr ""
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid ""
+"Provides functionality for marking a calendar or an addressbook as the "
+"default one."
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:562
+msgid "_Custom Header"
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:883
+#, fuzzy
+msgid "Key"
+msgstr "کينيا"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr ""
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr ""
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Adds custom header to outgoing messages."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr ""
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Header"
+msgstr ""
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "د بل کارن پوښۍ پرانيستل"
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
+msgid "_Account:"
+msgstr ":ګڼون_"
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr ":د پوښۍ نوم_"
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
+msgid "_User:"
+msgstr ":کارن_"
+
+#. i18n: "Secure Password Authentication" is an Outlookism
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
+msgid "Secure Password"
+msgstr "خوندي تېرنويې"
+
+#. i18n: "NTLM" probably doesn't translate
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
+msgid ""
+"This option will connect to the Exchange server using secure password (NTLM) "
+"authentication."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
+msgid "Plaintext Password"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
+msgid ""
+"This option will connect to the Exchange server using standard plaintext "
+"password authentication."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
+msgid "Out Of Office"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
+msgid ""
+"The message specified below will be automatically sent to \n"
+"each person who sends mail to you while you are out of the office."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
+msgid "I am out of the office"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
+msgid "I am in the office"
+msgstr ""
+
+#. Change Password
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
+msgid "Change the password for Exchange account"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+msgid "Change Password"
+msgstr "تېرنويې بدلول"
+
+#. Delegation Assistant
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
+msgid "Manage the delegate settings for Exchange account"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
+msgid "Delegation Assistant"
+msgstr ""
+
+#. Miscelleneous settings
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
+msgid "Miscelleneous"
+msgstr ""
+
+#. Folder Size
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
+msgid "View the size of all Exchange folders"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
+msgid "Folders Size"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
+msgid "Exchange Settings"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:674
+msgid "_OWA URL:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:700
+msgid "A_uthenticate"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:721
+msgid "_Mailbox:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:922
+msgid "_Authentication Type"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
+msgid "Ch_eck for Supported Types"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:1048
+#: ../plugins/exchange-operations/exchange-contacts.c:212
+#, c-format
+msgid "%s KB"
+msgstr "ک ب ‎%s"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:1050
+#: ../plugins/exchange-operations/exchange-contacts.c:214
+#, c-format
+msgid "0 KB"
+msgstr "‎‏۰ ک ب"
+
+#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-contacts.c:165
+msgid ""
+"Evolution is in offline mode. You cannot create or modify folders now.\n"
+"Please switch to online mode for such operations."
+msgstr ""
+
+#. User entered a wrong existing
+#. * password. Prompt him again.
+#.
+#: ../plugins/exchange-operations/exchange-change-password.c:113
+msgid ""
+"The current password does not match the existing password for your account. "
+"Please enter the correct password"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-change-password.c:120
+msgid "The two passwords do not match. Please re-enter the passwords."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+msgid "Confirm Password:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+msgid "Current Password:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+msgid "New Password:"
+msgstr ":نوې تېرنويې"
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+msgid "Your current password has expired. Please change your password now."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#, c-format
+msgid "Your password will expire in the next %d days"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
+msgid "Custom"
+msgstr "دوديز"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+msgid "Editor (read, create, edit)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+msgid "Author (read, create)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+msgid "Reviewer (read-only)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Delegate Permissions"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
+#, c-format
+msgid "Permissions for %s"
+msgstr ""
+
+#. To translators: This is a part of the message to be sent to the delegatee
+#. summarizing the permissions assigned to him.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
+msgid ""
+"This message was sent automatically by Evolution to inform you that you have "
+"been designated as a delegate. You can now send messages on my behalf."
+msgstr ""
+
+#. To translators: Another chunk of the same message.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+msgid "You have been given the following permissions on my folders:"
+msgstr ""
+
+#. To translators: This message is included if the delegatee has been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
+msgid "You are also permitted to see my private items."
+msgstr ""
+
+#. To translators: This message is included if the delegatee has not been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+msgid "However you are not permitted to see my private items."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#, c-format
+msgid "You have been designated as a delegate for %s"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:415
+msgid "Delegate To"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:580
+#, c-format
+msgid "Remove the delegate %s?"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:698
+msgid "Could not access Active Directory"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:710
+msgid "Could not find self in Active Directory"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:723
+#, c-format
+msgid "Could not find delegate %s in Active Directory"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:735
+#, c-format
+msgid "Could not remove delegate %s"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:795
+msgid "Could not update list of delegates."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:813
+#, c-format
+msgid "Could not add delegate %s"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:981
+msgid "Error reading delegates list."
+msgstr ""
+
+#. Translators: This is used for permissions for <user> for the folder Calendar.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+msgid "C_alendar:"
+msgstr ":ک_ليز"
+
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+msgid "Co_ntacts:"
+msgstr ":اړ_يکلوري"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid "Delegates"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+msgid "Permissions for"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+msgid ""
+"These users will be able to send mail on your behalf\n"
+"and access your folders with the permissions you give them."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+msgid "_Delegate can see private items"
+msgstr ""
+
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
+msgid "_Inbox:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
+msgid "_Summarize permissions"
+msgstr ""
+
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+msgid "_Tasks:"
+msgstr ":دندې_"
+
+#: ../plugins/exchange-operations/exchange-folder-permission.c:59
+#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
+msgid "Permissions..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
+msgid "Folder Name"
+msgstr "د پوښۍ نوم"
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
+msgid "Folder Size"
+msgstr ""
+
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+msgid "User"
+msgstr "کارن"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+msgid "Subscribe to Other User's Folder"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
+msgid "Exchange Folder Tree"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:234
+#: ../plugins/exchange-operations/exchange-folder.c:244
+msgid "Unsubscribe Folder..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:519
+#, c-format
+msgid "Really unsubscribe from folder \"%s\"?"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:531
+#, c-format
+msgid "Unsubscribe from \"%s\""
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
+msgid "<b>Status:</b>"
+msgstr "<b>انکړ</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
+msgid "I am currently in the office"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
+msgid "I am currently out of the office"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+msgid "No, Don't Change Status"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
+msgid "Out of Office Assistant"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
+msgid "Yes, Change Status"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
+msgid "Password Expiry Warning..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
+msgid "Your password will expire in 7 days..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
+msgid "_Change Password"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
+msgid "(Permission denied.)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+msgid "Add User:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../plugins/groupwise-features/proxy.c:934
+#: ../plugins/groupwise-features/share-folder.c:715
+msgid "Add User"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+msgid "<b>Permissions</b>"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+msgid "Cannot Delete"
+msgstr "نه شي ړنګولی"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+msgid "Cannot Edit"
+msgstr "نه شي سمولی"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+msgid "Create items"
+msgstr "توکي جوړول"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+msgid "Create subfolders"
+msgstr "څېرمه پوښۍ جوړول"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+msgid "Delete Any Items"
+msgstr "ټول توکي ړنګول"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+msgid "Delete Own Items"
+msgstr "خپل توکي ړنګول"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+msgid "Edit Any Items"
+msgstr "ټول توکي سمول"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+msgid "Edit Own Items"
+msgstr "خپل توکي سمول"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+msgid "Folder contact"
+msgstr "پوښۍ اړيکلوری"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+msgid "Folder owner"
+msgstr "د پوښۍ خاوند"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+msgid "Folder visible"
+msgstr "پوښۍ ښکاري"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+msgid "Read items"
+msgstr "توکي لوستل"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+msgid "Role: "
+msgstr ":رول"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
+msgid "<b>Message Settings</b>"
+msgstr "<b>د استوزې امستنې</b>"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
+msgid "<b>Tracking Options</b>"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
+msgid "Exchange - Send Options"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
+msgid "I_mportance: "
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
+msgid ""
+"Normal\n"
+"High\n"
+"Low"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
+msgid ""
+"Normal\n"
+"Personal\n"
+"Private\n"
+"Confidential"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
+msgid "Request a _delivery receipt for this message"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
+msgid "Request a _read receipt for this message"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
+msgid "Send as Delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
+msgid "_Sensitivity: "
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
+msgid "_User"
+msgstr "کارن_"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
+msgid "button-user"
+msgstr "تڼۍ-کارن"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+msgid "Select User"
+msgstr "کارن وټاکئ"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+msgid "Address Book..."
+msgstr "...پته کتاب"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
+msgid "Subscribe to Other User's Contacts"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
+msgid "Subscribe to Other User's Calendar"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+msgid ""
+"A plugin that manages a collection of Exchange account specific operations "
+"and features."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
+msgid "Exchange Operations"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+msgid "Cannot change password due to configuration problems."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+msgid "Cannot display folders."
+msgstr ".پوښۍ نه شي ښودلی"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+msgid "Cannot perform the operation."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+msgid ""
+"Changes to options for Exchange account \"{0}\" will only take effect after "
+"restarting Evolution."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+msgid "Could not authenticate to server."
+msgstr ".د پالنګر سره نه شي کره کولی"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+msgid "Could not change password."
+msgstr ".تېرنويې نه شي بدلولی"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+msgid ""
+"Could not configure Exchange account because \n"
+"an unknown error occurred. Check the URL, \n"
+"username, and password, and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+msgid "Could not connect to Exchange server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+msgid "Could not connect to server {0}."
+msgstr ".{0} پالنګر سره نه شي نښلېدی‎"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+msgid "Could not determine folder permissions for delegates."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+msgid "Could not find Exchange Web Storage System."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+msgid "Could not locate server {0}."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+msgid "Could not make {0} a delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+msgid "Could not read folder permissions"
+msgstr "د پوښۍ پرېښلې نه شي لوستلی"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+msgid "Could not read folder permissions."
+msgstr ".د پوښۍ پرېښلې نه شي لوستلی"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+msgid "Could not read out-of-office state"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+msgid "Could not update folder permissions."
+msgstr ".د پوښۍ پرېښلې نه شي اوسمهالولی"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+msgid "Could not update out-of-office state"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+msgid "Exchange Account is offline."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
+msgid ""
+"Exchange Connector requires access to certain\n"
+"functionality on the Exchange Server that appears\n"
+"to be disabled or blocked. (This is usually \n"
+"unintentional.) Your Exchange Administrator will \n"
+"need to enable this functionality in order for \n"
+"you to be able to use Evolution Exchange Connector.\n"
+"\n"
+"For information to provide to your Exchange \n"
+"administrator, please follow the link below:\n"
+"\n"
+"{0}\n"
+"  "
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+msgid "Failed to update delegates:"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+msgid "Folder already exists"
+msgstr "پوښۍ د مخکې نه شتون لري"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+msgid "Folder does not exist"
+msgstr "پوښۍ شتون نه لري"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+msgid "Folder offline"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1286
+msgid "Generic error"
+msgstr "ټولګړې تېروتنه"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+msgid "Global Catalog Server is not reachable"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+msgid ""
+"If OWA is running on a different path, you must specify that in the account "
+"configuration dialog."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+msgid "Mailbox for {0} is not on this server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+msgid "Make sure the URL is correct and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+msgid "Make sure the server name is spelled correctly and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+msgid "Make sure the username and password are correct and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+msgid "No Global Catalog server configured for this account."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+msgid "No mailbox for user {0} on {1}."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "No such user {0}"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+msgid "Please make sure the Global Catalog Server name is correct."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+msgid "Please restart Evolution for changes to take effect"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+msgid "Please select a user."
+msgstr ".يو کارن وټاکئ"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+msgid "Server rejected password because it is too weak."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+msgid "The Exchange account will be disabled when you quit Evolution"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+msgid "The Exchange account will be removed when you quit Evolution"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+msgid "The Exchange server is not compatible with Exchange Connector."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+msgid ""
+"The server is running Exchange 5.5. Exchange Connector \n"
+"supports Microsoft Exchange 2000 and 2003 only."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+msgid ""
+"This probably means that your server requires \n"
+"you to specify the Windows domain name \n"
+"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
+"\n"
+"Or you might have just typed your password wrong."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+msgid "Try again with a different password."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+msgid "Unable to add user to access control list:"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+msgid "Unable to edit delegates."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+msgid "Unknown error looking up {0}"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+msgid "Unknown error."
+msgstr ".ناپېژندلې تېروتنه"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+msgid "Unknown type"
+msgstr ".ناپېژندلی ډول"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+msgid "Unsupported operation"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+msgid "You are nearing your quota available for storing mail on this server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+msgid ""
+"You are permitted to send a message on behalf of only one delegator at a "
+"time."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+msgid "You cannot make yourself your own delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+msgid "You have exceeded your quota for storing mail on this server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+msgid "You may only configure a single Exchange account."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+msgid ""
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+msgid ""
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+msgid ""
+"Your current usage is: {0} KB. You will not be able to send mail until you "
+"clear up some space by deleting some mail."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+msgid "Your password has expired."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+msgid "{0} cannot be added to an access control list"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+msgid "{0} is already a delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
+msgid "{0} is already in the list"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
+msgid "Subscribe to Other User's Tasks"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
+msgid "Check folder permissions"
+msgstr "پوښۍ پرېښلې کتل"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "تلواله بهرنی سمبالګر"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+msgid ""
+"A plugin for using an external editor as the composer. You can send only "
+"plain-text messages."
+msgstr ""
+
+#. the path to the shared library
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
+msgid "External Editor"
+msgstr "بهرنی سمبالګر"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "لنډمهاله دوتنه نه شي جوړولی"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
+msgid "Compose in External Editor"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
+msgid "Compose messages using an external editor"
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:91
+msgid "Command to be executed to launch the editor: "
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:92
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+
+#: ../plugins/face/face.c:58
+msgid "Select a (48*48) png of size < 700bytes"
+msgstr ""
+
+#: ../plugins/face/face.c:68
+msgid "PNG files"
+msgstr "دوتنې PNG"
+
+#: ../plugins/face/face.c:125
+msgid "_Face"
+msgstr "مخ_"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid ""
+"Attach Face header to outgoing messages. First time the user needs to "
+"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
+"faces This will be used in messages that are sent further."
+msgstr ""
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "مخ"
+
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr ""
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
+msgid "Allows unsubscribing of mail folders in the folder tree context menu."
+msgstr ""
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid "Unsubscribe Folders"
+msgstr "پوښۍ ناګډونول_"
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+msgid "_Unsubscribe"
+msgstr "ناګډونول_"
+
+#: ../plugins/google-account-setup/google-source.c:73
+#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
+msgid "Google"
+msgstr "ګوګل"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+#, fuzzy
+msgid "<b>Server</b>"
+msgstr "<b>غړي</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+#, fuzzy
+msgid "Username:"
+msgstr ":کا_رننوم"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:230
+#, fuzzy
+msgid "Update every"
+msgstr "پوښتن اوسمهالول کيږي"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin to setup google calendar and contacts."
+msgstr "د ګوګل کليز امستلو لپاره يو لګون"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Google sources"
+msgstr "ګوګل سرچينې"
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+msgid "Checklist"
+msgstr ""
+
+#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
+msgid "A plugin to setup groupwise calendar and contacts sources."
+msgstr ""
+
+#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
+msgid "Groupwise Account Setup"
+msgstr ""
+
+#: ../plugins/groupwise-features/install-shared.c:219
+#, c-format
+msgid ""
+"The user '%s' has shared a folder with you\n"
+"\n"
+"Message from '%s'\n"
+"\n"
+"\n"
+"%s\n"
+"\n"
+"\n"
+"Click 'Forward' to install the shared folder\n"
+"\n"
+msgstr ""
+
+#: ../plugins/groupwise-features/install-shared.c:224
+msgid "Install the shared folder"
+msgstr "ونډول شوې پوښۍ لګول"
+
+#: ../plugins/groupwise-features/install-shared.c:226
+msgid "Shared Folder Installation"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:78
+msgid "Junk Settings"
+msgstr "سرکودن امستنې"
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
+msgid "Junk Mail Settings"
+msgstr "د سرکودن ليک امستنې"
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:115
+msgid "Junk Mail Settings..."
+msgstr "...د سرکودن ليک امستنې"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:1
+msgid "<b>Junk List:</b>"
+msgstr "<b>سرکودن لړ:</b>"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:2
+msgid "Email:"
+msgstr "برېښليک"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:5
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
+msgid "_Disable"
+msgstr "ناتوانول_"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:6
+msgid "_Enable"
+msgstr "توانول_"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:7
+msgid "_Junk List"
+msgstr "سرکودن لړ_"
+
+#: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:77
+msgid "Message retracted successfully"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:87
+msgid "Retract Mail"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
+msgid "Add Send Options to groupwise messages"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
+msgid "A plugin for the features in Groupwise accounts."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
+msgid "Groupwise Features"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+msgid "Message retract failed"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+msgid "The server did not allow the selected message to be retracted."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+msgid "Invalid user"
+msgstr "ناسم کارن"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+msgid "Specify User"
+msgstr "کارن ټاکل"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+msgid "You have already given proxy permissions to this user."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+msgid "Account Already Exists"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
+"try again."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+msgid "What would you like to {0}?"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You have to specify a user name whom you want to add to the list"
+msgstr ""
+
+#: ../plugins/groupwise-features/process-meeting.c:49
+msgid "Accept Tentatively"
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:1
+msgid "<b>Users:</b>"
+msgstr "<b>کارنان</b>"
+
+#: ../plugins/groupwise-features/properties.glade.h:2
+msgid "C_ustomize notification message"
+msgstr "ي_ادښت استوزه دوديزول"
+
+#: ../plugins/groupwise-features/properties.glade.h:3
+msgid "Con_tacts..."
+msgstr "...اړي_کلوري"
+
+#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../widgets/table/e-table-click-to-add.c:517
+msgid "Message"
+msgstr "استوزه"
+
+#: ../plugins/groupwise-features/properties.glade.h:6
+msgid "Shared Folder Notification"
+msgstr "د ونډول شوې پوښۍ يادښت"
+
+#: ../plugins/groupwise-features/properties.glade.h:8
+msgid "The participants will receive the following notification.\n"
+msgstr ".ګډونوال به لاندنی يادښت ترلاسه کړي\n"
+
+#: ../plugins/groupwise-features/properties.glade.h:12
+msgid "_Not Shared"
+msgstr "نه دی ونډول شوی_"
+
+#: ../plugins/groupwise-features/properties.glade.h:14
+msgid "_Shared With..."
+msgstr "...ونډول شوی سره د_"
+
+#: ../plugins/groupwise-features/properties.glade.h:15
+msgid "_Sharing"
+msgstr "ونډول کيږي_"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
+msgid "<b>Name</b>"
+msgstr "<b>نوم</b>"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+msgid "Access Rights"
+msgstr "لاسرس رښتې"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+msgid "Add/Edit"
+msgstr "زياتول/سمول"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+msgid "Con_tacts"
+msgstr "اړي_کلوري"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+msgid "Modify _folders/options/rules/"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+msgid "Read items marked _private"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+msgid "Reminder Notes"
+msgstr "رايادونې يادښت"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+msgid "Subscribe to my _alarms"
+msgstr "زما _خبرونو کې ګډون کول"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+msgid "Subscribe to my _notifications"
+msgstr "زما _يادښتونو کې ګډون کول"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+msgid "_Write"
+msgstr "ليکل_"
+
+#. To Translators: strip the part in front of the | and the | itself
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+msgid "permission to read|_Read"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+msgid "Proxy"
+msgstr "ګوډاګی"
+
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+msgid "<b>Account Name</b>"
+msgstr "<b>ګڼون نوم</b>"
+
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+msgid "Proxy Login"
+msgstr "ګوډاګی ننوتون"
+
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:491
+#: ../plugins/groupwise-features/send-options.c:83
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr ""
+
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
+#. * feature by which one person can send/read mails/appointments using another person's identity
+#. * without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login.c:509
+msgid "_Proxy Login..."
+msgstr "...ګوډاګی ننوتون_"
+
+#: ../plugins/groupwise-features/proxy.c:691
+msgid "The Proxy tab will be available only when the account is online."
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy.c:696
+msgid "The Proxy tab will be available only when the account is enabled."
+msgstr ""
+
+#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder.c:750
+msgid "Users"
+msgstr "کارنان"
+
+#: ../plugins/groupwise-features/share-folder-common.c:320
+msgid "Enter the users and set permissions"
+msgstr ""
+
+#: ../plugins/groupwise-features/share-folder-common.c:339
+msgid "New _Shared Folder..."
+msgstr "...نوې _ونډول شوې پوښۍ"
+
+#: ../plugins/groupwise-features/share-folder-common.c:447
+msgid "Sharing"
+msgstr "ونډول کيږي"
+
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "دوديز يادښت"
+
+#: ../plugins/groupwise-features/share-folder.c:755
+msgid "Add   "
+msgstr "زياتول"
+
+#: ../plugins/groupwise-features/share-folder.c:761
+msgid "Modify"
+msgstr "بدلول"
+
+#: ../plugins/groupwise-features/status-track.c:105
+msgid "Message Status"
+msgstr "استوزه انکړ"
+
+#. Subject
+#: ../plugins/groupwise-features/status-track.c:119
+msgid "Subject:"
+msgstr ":سرليک"
+
+#: ../plugins/groupwise-features/status-track.c:133
+msgid "From:"
+msgstr ":له"
+
+#: ../plugins/groupwise-features/status-track.c:148
+msgid "Creation date:"
+msgstr ":د جوړولو نېټه"
+
+#: ../plugins/groupwise-features/status-track.c:187
+msgid "Recipient: "
+msgstr ":نیوونی"
+
+#: ../plugins/groupwise-features/status-track.c:194
+msgid "Delivered: "
+msgstr ":استول شوي"
+
+#: ../plugins/groupwise-features/status-track.c:200
+msgid "Opened: "
+msgstr ":پرانيستل شوي"
+
+#: ../plugins/groupwise-features/status-track.c:205
+msgid "Accepted: "
+msgstr ":منل شوي"
+
+#: ../plugins/groupwise-features/status-track.c:210
+msgid "Deleted: "
+msgstr ":ړنګول شوي"
+
+#: ../plugins/groupwise-features/status-track.c:215
+msgid "Declined: "
+msgstr ":نامنل شوي"
+
+#: ../plugins/groupwise-features/status-track.c:220
+msgid "Completed: "
+msgstr ":بشپړ شوي"
+
+#: ../plugins/groupwise-features/status-track.c:225
+msgid "Undelivered: "
+msgstr ":نالېږل شوي"
+
+#: ../plugins/groupwise-features/status-track.c:249
+msgid "Track Message Status..."
+msgstr ""
+
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
+msgid "A plugin to setup hula calendar sources."
+msgstr ""
+
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
+msgid "Hula Account Setup"
+msgstr "هولا ګڼون امسته"
+
+#: ../plugins/imap-features/imap-headers.c:320
+msgid "Custom Headers"
+msgstr "دوديزې سريزې"
+
+#: ../plugins/imap-features/imap-headers.c:333
+msgid "IMAP Headers"
+msgstr "سريزې IMAP"
+
+#: ../plugins/imap-features/imap-headers.glade.h:1
+msgid "<b>Custom Headers</b>"
+msgstr "<b>دوديزې سريزې</b>"
+
+#: ../plugins/imap-features/imap-headers.glade.h:2
+msgid "<b>IMAP Headers</b>"
+msgstr "<b>سريزې IMAP</b>"
+
+#: ../plugins/imap-features/imap-headers.glade.h:3
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:4
+msgid "Fetch A_ll Headers"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:5
+msgid ""
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
+"You can ignore this if you choose \"All Headers\"."
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:7
+msgid ""
+"Select your IMAP Header Preferences. \n"
+"The more headers you have the more time it will take to download."
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:9
+msgid ""
+"_Basic Headers - (Fastest) \n"
+"Use this if you do not have filters based on mailing lists"
+msgstr ""
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
+msgid "A plugin for the features in the IMAP accounts."
+msgstr ""
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+msgid "IMAP Features"
+msgstr ""
+
+#: ../plugins/import-ics-attachments/icsimporter.c:78
+msgid "_Import to Calendar"
+msgstr "کليز ته دننول_"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:83
+msgid "_Import to Tasks"
+msgstr "دندو ته دننول_"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:201
+msgid "Import ICS"
+msgstr "دننول ICS"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:224
+msgid "Select Task List"
+msgstr "دنده لړ وټاکئ"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:228
+msgid "Select Calendar"
+msgstr "کليز وټاکئ"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../shell/e-shell-importer.c:700
+msgid "_Import"
+msgstr "دننول_"
+
+#. the path to the shared library
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
+msgid "Import to Calendar"
+msgstr "کليز ته دننول"
+
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
+msgid "Imports ICS attachments to calendar."
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+msgid "Hardware Abstraction Layer not loaded"
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+msgid ""
+"The \"hald\" service is required but not currently running. Please enable "
+"the service and rerun this program, or contact your system administrator."
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+msgid "Search for an iPod failed"
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+msgid ""
+"Evolution could not find an iPod to synchronize with. Either the iPod is not "
+"connected to the system or it is not powered on."
+msgstr ""
+
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
+msgid "iCalendar format (.ics)"
+msgstr ""
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
+msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgstr ""
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+msgid "Synchronize to iPod"
+msgstr ""
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
+msgid "iPod Synchronization"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:444
+#: ../plugins/itip-formatter/itip-formatter.c:569
+#, c-format
+msgid "Failed to load the calendar '%s'"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:589
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:615
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:691
+msgid "Unable to find any calendars"
+msgstr "کوم کليزونه نه شي موندلی"
+
+#: ../plugins/itip-formatter/itip-formatter.c:698
+msgid "Unable to find this meeting in any calendar"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:702
+msgid "Unable to find this task in any task list"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:706
+msgid "Unable to find this memo in any memo list"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:777
+msgid "Searching for an existing version of this appointment"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:946
+msgid "Unable to parse item"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1004
+#, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1016
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1020
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1025
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1030
+#, c-format
+msgid "Sent to calendar '%s' as canceled"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1124
+#, c-format
+msgid "Organizer has removed the delegate %s "
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1131
+msgid "Sent a cancelation notice to the delegate"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1133
+msgid "Could not send the cancelation notice to the delegate"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1219
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1246
+#, c-format
+msgid "Unable to update attendee. %s"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1250
+msgid "Attendee status updated"
+msgstr "د ګډونوال انکړ اوسمهال کړل شو"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1276
+msgid "Meeting information sent"
+msgstr "د کتنې خبرتياوې ولېږل شوې"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1279
+msgid "Task information sent"
+msgstr "د دندې خبرتياوې ولېږل شوې"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1282
+msgid "Memo information sent"
+msgstr "د ميمو خبرتياوې ولېږل شوې"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1291
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1294
+msgid "Unable to send task information, the task does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1297
+msgid "Unable to send memo information, the memo does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
+msgid "The calendar attached is not valid"
+msgstr "نښتی کليز سم نه دی"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1367
+#: ../plugins/itip-formatter/itip-formatter.c:1378
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
+msgid "The item in the calendar is not valid"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1437
+#: ../plugins/itip-formatter/itip-formatter.c:1519
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1448
+msgid "The calendar attached contains multiple items"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1449
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:2149
+msgid "This meeting recurs"
+msgstr "دا کتنه بياپېښيږي"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2152
+msgid "This task recurs"
+msgstr "دا دنده بياپېښيږي"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2155
+msgid "This memo recurs"
+msgstr "دا ميمو بياپېښيږي"
+
+#. Delete message after acting
+#. FIXME Need a schema for this
+#: ../plugins/itip-formatter/itip-formatter.c:2384
+msgid "_Delete message after acting"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
+msgid "Conflict Search"
+msgstr ""
+
+#. Source selector
+#: ../plugins/itip-formatter/itip-formatter.c:2409
+msgid "Select the calendars to search for meeting conflicts"
+msgstr ""
+
+#. strftime format of a weekday and a date.
+#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:299
+msgid "Today"
+msgstr "نن"
+
+#. strftime format of a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:195
+msgid "Today %H:%M"
+msgstr "%H:%M نن‎"
+
+#. strftime format of a time,
+#. in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:199
+msgid "Today %H:%M:%S"
+msgstr "%H:%M:%S نن‎"
+
+#. strftime format of a time,
+#. in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:208
+msgid "Today %l:%M:%S %p"
+msgstr "%l:%M:%S %p نن‎"
+
+#. strftime format of a weekday and a date.
+#: ../plugins/itip-formatter/itip-view.c:218
+msgid "Tomorrow"
+msgstr "سبا"
+
+#. strftime format of a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:223
+msgid "Tomorrow %H:%M"
+msgstr "%H:%M سبا"
+
+#. strftime format of a time,
+#. in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:227
+msgid "Tomorrow %H:%M:%S"
+msgstr "%H:%M:%S سبا"
+
+#. strftime format of a time,
+#. in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:232
+msgid "Tomorrow %l:%M %p"
+msgstr "%l:%M %p سبا"
+
+#. strftime format of a time,
+#. in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:236
+msgid "Tomorrow %l:%M:%S %p"
+msgstr "%l:%M:%S %p سبا"
+
+#. strftime format of a weekday.
+#: ../plugins/itip-formatter/itip-view.c:255
+#, c-format
+msgid "%A"
+msgstr "%A"
+
+#. strftime format of a weekday and a
+#. time, in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:260
+msgid "%A %H:%M"
+msgstr "%A %H:%M"
+
+#. strftime format of a weekday and a
+#. time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:264
+msgid "%A %H:%M:%S"
+msgstr "%A %H:%M:%S"
+
+#. strftime format of a weekday and a
+#. time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:269
+msgid "%A %l:%M %p"
+msgstr "%A %l:%M %p"
+
+#. strftime format of a weekday and a
+#. time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:273
+msgid "%A %l:%M:%S %p"
+msgstr "%A %l:%M:%S %p"
+
+#. strftime format of a weekday and a date
+#. without a year.
+#: ../plugins/itip-formatter/itip-view.c:282
+msgid "%A, %B %e"
+msgstr "%A, %B %e"
+
+#. strftime format of a weekday, a date
+#. without a year and a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:288
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %B %e %H:%M"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:292
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %B %e %H:%M:%S"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:297
+msgid "%A, %B %e %l:%M %p"
+msgstr "%A, %B %e %l:%M %p"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:301
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %B %e %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: ../plugins/itip-formatter/itip-view.c:307
+msgid "%A, %B %e, %Y"
+msgstr "%A, %B %e, %Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:312
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%A, %B %e, %Y %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:316
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%A, %B %e, %Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:321
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%A, %B %e, %Y %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:325
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%A, %B %e, %Y %l:%M:%S %p"
+
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:526
+#, c-format
+msgid "Please respond on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
+#, c-format
+msgid "Received on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:357
+#, c-format
+msgid "<b>%s</b> through %s has published the following meeting information:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:359
+#, c-format
+msgid "<b>%s</b> has published the following meeting information:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:364
+#, c-format
+msgid "<b>%s</b> has delegated the following meeting to you:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:367
+#, c-format
+msgid "<b>%s</b> through %s requests your presence at the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:369
+#, c-format
+msgid "<b>%s</b> requests your presence at the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:375
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:377
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:381
+#, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:383
+#, c-format
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:387
+#, c-format
+msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:389
+#, c-format
+msgid "<b>%s</b> has sent back the following meeting response:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:393
+#, c-format
+msgid "<b>%s</b> through %s has canceled the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:395
+#, c-format
+msgid "<b>%s</b> has canceled the following meeting."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:399
+#, c-format
+msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:401
+#, c-format
+msgid "<b>%s</b> has proposed the following meeting changes."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:405
+#, c-format
+msgid "<b>%s</b> through %s has declined the following meeting changes:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:407
+#, c-format
+msgid "<b>%s</b> has declined the following meeting changes."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:445
+#, c-format
+msgid "<b>%s</b> through %s has published the following task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:447
+#, c-format
+msgid "<b>%s</b> has published the following task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:452
+#, c-format
+msgid "<b>%s</b> requests the assignment of %s to the following task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:455
+#, c-format
+msgid "<b>%s</b> through %s has assigned you a task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:457
+#, c-format
+msgid "<b>%s</b> has assigned you a task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:463
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:465
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:469
+#, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:471
+#, c-format
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:475
+#, c-format
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:477
+#, c-format
+msgid "<b>%s</b> has sent back the following assigned task response:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:481
+#, c-format
+msgid "<b>%s</b> through %s has canceled the following assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:483
+#, c-format
+msgid "<b>%s</b> has canceled the following assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:487
+#, c-format
+msgid ""
+"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:489
+#, c-format
+msgid "<b>%s</b> has proposed the following task assignment changes:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:493
+#, c-format
+msgid "<b>%s</b> through %s has declined the following assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:495
+#, c-format
+msgid "<b>%s</b> has declined the following assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:533
+#, c-format
+msgid "<b>%s</b> through %s has published the following memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:535
+#, c-format
+msgid "<b>%s</b> has published the following memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:540
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:542
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:546
+#, c-format
+msgid "<b>%s</b> through %s has canceled the following shared memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:548
+#, c-format
+msgid "<b>%s</b> has canceled the following shared memo:"
+msgstr ""
+
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:819
+msgid "_Open Calendar"
+msgstr "کليز پرانيستل_"
+
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:852
+#: ../plugins/itip-formatter/itip-view.c:857
+msgid "_Decline"
+msgstr "نه منل_"
+
+#: ../plugins/itip-formatter/itip-view.c:826
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
+msgid "_Accept"
+msgstr "منل_"
+
+#: ../plugins/itip-formatter/itip-view.c:829
+msgid "_Decline all"
+msgstr "ټول نه منل_"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+msgid "_Tentative all"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:836
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Tentative"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:831
+msgid "_Accept all"
+msgstr "ټول منل_"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:842
+msgid "_Send Information"
+msgstr "خبرتياوې لېږل_"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:846
+msgid "_Update Attendee Status"
+msgstr "د ګډونوال انکړ اوسمهالول"
+
+#: ../plugins/itip-formatter/itip-view.c:849
+msgid "_Update"
+msgstr "اوسمهالول_"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:1010
+msgid "Start time:"
+msgstr ":پېل مهال"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:1019
+msgid "End time:"
+msgstr "پای مهال"
+
+#. Comment
+#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../plugins/itip-formatter/itip-view.c:1085
+msgid "Comment:"
+msgstr ":څرګندون"
+
+#: ../plugins/itip-formatter/itip-view.c:1071
+msgid "Send _reply to sender"
+msgstr "استوونکي ته _ځواب لېږل"
+
+#: ../plugins/itip-formatter/itip-view.c:1099
+msgid "Send _updates to attendees"
+msgstr "ګډونوالانو ته _اوسمهالونې لېږل"
+
+#: ../plugins/itip-formatter/itip-view.c:1108
+msgid "_Apply to all instances"
+msgstr "په ټولو بېلګو کارول_"
+
+#: ../plugins/itip-formatter/itip-view.c:1117
+msgid "Show time as _free"
+msgstr "مهال لکه _وزګار ښودل"
+
+#: ../plugins/itip-formatter/itip-view.c:1850
+msgid "_Tasks :"
+msgstr ":دندې_"
+
+#: ../plugins/itip-formatter/itip-view.c:1852
+msgid "Memos :"
+msgstr ": ميموګانې"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
+msgid "Displays text/calendar parts in messages."
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Itip Formatter"
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+msgid ""
+"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
+"&quot;{1}&quot;?"
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+msgid "This meeting has been delegated"
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr ""
+
+#: ../plugins/mail-account-disable/mail-account-disable.c:47
+msgid "Proxy _Logout"
+msgstr "ګوډاګی _وتون"
+
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
+msgid "Allows disabling of accounts."
+msgstr ".د ګڼونونو ناتوانونه پرېښل"
+
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable Account"
+msgstr "ګڼون ناتوانول"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Beep or play sound file."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Blink icon in notification area."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Enable D-Bus messages."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Enable icon in notification area."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+msgid ""
+"If true, then beep, otherwise will play sound file when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Notify new messages for Inbox only."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid "Play sound when new messages arrive."
+msgstr "د نوې استوزې د رسېدو پر مهال غږ غږول"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Popup message together with the icon."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid "Sound file name to be played."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+msgid "Whether play sound or beep when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Whether show message over the icon when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+msgid "Whether the icon should blink or not."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:255
+msgid "Generate a _D-Bus message"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:361
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "ليک يادښت"
+
+#: ../plugins/mail-notification/mail-notification.c:382
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "ليک يادښت"
+
+#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:440
+#, c-format
+msgid ""
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
+"You have received %d new messages\n"
+"in %s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/mail-notification/mail-notification.c:445
+#, c-format
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:462
+msgid "New email"
+msgstr "نوی برېښليک"
+
+#: ../plugins/mail-notification/mail-notification.c:519
+msgid "Show icon in _notification area"
+msgstr "په _يادښت سيمه کې انځورن ښودل"
+
+#: ../plugins/mail-notification/mail-notification.c:522
+msgid "B_link icon in notification area"
+msgstr "په يادښت سيمه کې انځورن پ_ړکول"
+
+#: ../plugins/mail-notification/mail-notification.c:524
+msgid "Popup _message together with the icon"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:705
+msgid "_Play sound when new messages arrive"
+msgstr "د نويو استوزو د رارسېدو پر مهال غږ غږول_"
+
+#: ../plugins/mail-notification/mail-notification.c:711
+msgid "_Beep"
+msgstr "بيپ_"
+
+#: ../plugins/mail-notification/mail-notification.c:712
+msgid "Play _sound file"
+msgstr "غږيزه _دوتنه غږول"
+
+#: ../plugins/mail-notification/mail-notification.c:723
+msgid "Specify _filename:"
+msgstr ":دوتنه نوم _وټاکئ"
+
+#: ../plugins/mail-notification/mail-notification.c:724
+msgid "Select sound file"
+msgstr "غږيزه دوتنه وټاکئ"
+
+#: ../plugins/mail-notification/mail-notification.c:725
+msgid "Pl_ay"
+msgstr "غږ_ول"
+
+#: ../plugins/mail-notification/mail-notification.c:782
+msgid "Notify new messages for _Inbox only"
+msgstr ""
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid ""
+"Generates a D-Bus message or notifies the user with an icon in notification "
+"area and a notification message whenever a new message has arrived."
+msgstr ""
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Mail Notification"
+msgstr "ليک يادښت"
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+msgid ""
+"A plugin which allows the creation of meetings from the contents of a mail "
+"message."
+msgstr ""
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
+msgid "Con_vert to Meeting"
+msgstr "کت_نې ته اړول"
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
+msgid "Mail to meeting"
+msgstr "کتنې ته ليکل"
+
+#: ../plugins/mail-to-task/mail-to-task.c:270
+#, c-format
+msgid "Cannot open calendar. %s"
+msgstr "%s .کليز نه شي پرانيستلی"
+
+#: ../plugins/mail-to-task/mail-to-task.c:275
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
+msgstr ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid ""
+"A plugin which allows the creation of tasks from the contents of a mail "
+"message."
+msgstr ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
+msgid "Con_vert to Task"
+msgstr "دن_ده اړول"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
+msgid "Mail to task"
+msgstr "دندې ته ليکل"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Convert the selected message to a new task"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Contact list _owner"
+msgstr "د لړ _خاوند سره اړيکه نيول"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Get list _archive"
+msgstr "د لړ _ارشيو اخيستل"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+msgid "Get list _usage information"
+msgstr "د لړ د _کارونې خبرتياوې اخيستل"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
+msgid "Mailing List Actions"
+msgstr "د ليک لړ چارونه"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
+msgid "Mailing _List"
+msgstr "ليک _لړ"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
+msgid ""
+"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+msgid "_Post message to list"
+msgstr "لړ ته استوزه لېږل_"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+msgid "_Subscribe to list"
+msgstr "لړ کې ګډون کول_"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+msgid "_Un-subscribe to list"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+msgid "Action not available"
+msgstr "چار شتون نه لري"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
+msgid ""
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+msgid "Malformed header"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+msgid "No e-mail action"
+msgstr "هېڅ برېښليک چار"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
+msgid "Posting not allowed"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+msgid "Send e-mail message to mailing list?"
+msgstr "ليک لړ ته برېښليک استوزه لېږل غواړﺉ؟"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+msgid ""
+"The action could not be performed. This means the header for this action did "
+"not contain any action we could process.\n"
+"\n"
+"Header: {0}"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+msgid ""
+"This message does not contain the header information required for this "
+"action."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
+msgid "_Edit message"
+msgstr "استوزه سمول_"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
+msgid "_Send message"
+msgstr "استوزه لېږل_"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+msgid "Contact List _Owner"
+msgstr "د لړ _خاوند سره اړيکه نيول"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+msgid "Get List _Archive"
+msgstr "د لړ _ارشيو اخيستل"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+msgid "Get List _Usage Information"
+msgstr "د لړ د _کارونې خبرتياوې اخيستل"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
+msgid "Get an archive of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+msgid "Get information about the usage of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
+msgid "Post a message to the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
+msgid "Unsubscribe to the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+msgid "_Post Message to List"
+msgstr "لړ ته استوزه لېږل_"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+msgid "_Subscribe to List"
+msgstr "لړ کې ګډون کول_"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+msgid "_Unsubscribe from List"
+msgstr ""
+
+#: ../plugins/mark-all-read/mark-all-read.c:37
+msgid "Mark all messages in this folder and subfolders as read?"
+msgstr ""
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+msgid "Do you want the operation to be performed also in the subfolders?"
+msgstr ""
+
+#: ../plugins/mark-all-read/mark-all-read.c:85
+msgid "Mark All Messages as Read"
+msgstr "ټولې استوزې لکه لوستې نښول"
+
+#: ../plugins/mark-all-read/mark-all-read.c:162
+msgid "Current Folder and _Subfolders"
+msgstr "اوسنۍ پوښۍ او _څېرمه پوښۍ"
+
+#: ../plugins/mark-all-read/mark-all-read.c:174
+msgid "Current _Folder Only"
+msgstr "يوازې _اوسنۍ پوښۍ"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+msgid "Mark All Read"
+msgstr "ټول لوستي نښول"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+msgid "Mark Me_ssages as Read"
+msgstr "اس_توزې لکه لوستې نښول"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
+msgid "Used for marking all the messages under a folder as read"
+msgstr ""
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
+msgid "Mark calendar offline"
+msgstr "کليز لکه ناليکه نښول"
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
+msgid "Marks the selected calendar for offline viewing."
+msgstr ""
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
+msgid "_Do not make available for offline use"
+msgstr ""
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
+msgid "_Make available for offline use"
+msgstr ""
+
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
+msgid "A plugin which implements mono plugins."
+msgstr ""
+
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Mono Loader"
+msgstr ""
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
+msgid "A plugin for managing which plugins are enabled or disabled."
+msgstr ""
+
+#. Setup the ui
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
+#: ../plugins/plugin-manager/plugin-manager.c:236
+msgid "Plugin Manager"
+msgstr "لګون سمبالګر"
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+msgid "Enable and disable plugins"
+msgstr "لګونونه توانول او ناتوانول"
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
+msgid "_Plugins"
+msgstr "لګونونه_"
+
+#: ../plugins/plugin-manager/plugin-manager.c:42
+msgid "Author(s)"
+msgstr "ليکوال(ان)"
+
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "سازونه"
+
+#: ../plugins/plugin-manager/plugin-manager.c:249
+msgid "Note: Some changes will not take effect until restart"
+msgstr ""
+
+#: ../plugins/plugin-manager/plugin-manager.c:275
+msgid "Overview"
+msgstr ""
+
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
+msgid "Plugin"
+msgstr "لګون"
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
+msgid ""
+"A test plugin which demonstrates a formatter plugin which lets you choose to "
+"disable HTML messages.\n"
+"\n"
+"This plugin is unsupported demonstration code only.\n"
+msgstr ""
+
+#. but then we also need to create our own section frame
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+msgid "Plain Text Mode"
+msgstr "ساده ليکنې اکر"
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
+msgid "Prefer plain-text"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:174
+msgid "Show HTML if present"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:175
+msgid "Prefer PLAIN"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:176
+msgid "Only ever show PLAIN"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:219
+msgid "HTML _Mode"
+msgstr "اکر_HTML"
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
+msgid "Evolution Profiler"
+msgstr ""
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
+msgid "Writes a log of profiling data events."
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+msgid "Allows calendars to be published to the web"
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+msgid "Calendar Publishing"
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Locations"
+msgstr "ځايونه"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+msgid "_Publish Calendar Information"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:595
+msgid "Are you sure you want to remove this URL?"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:2
+msgid "<span weight=\"bold\">Location</span>"
+msgstr "<span weight=\"bold\">ځای</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr "<span weight=\"bold\">سرچينې</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:6
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "ت_وانول"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+msgid "P_ort:"
+msgstr ":د_رشل"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+msgid "Publishing Location"
+msgstr "د خپرولو ځای"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+msgid "Publishing _Frequency:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:13
+msgid ""
+"SSH\n"
+"Public FTP\n"
+"FTP (with login)\n"
+"Windows share\n"
+"WebDAV (HTTP)\n"
+"Secure WebDAV (HTTPS)\n"
+"Custom Location"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+msgid "Service _type:"
+msgstr ":د پالنې _ډول"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+msgid "_File:"
+msgstr ":دوتنه_"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+msgid "_Password:"
+msgstr ":تېرنويې_"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+msgid "_Publish as:"
+msgstr ":خپرول لکه_"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+msgid "_Remember password"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Username:"
+msgstr ":کارننوم_"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+msgid ""
+"iCal\n"
+"Free/Busy"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "پېټان لېښونکی"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+msgid "SpamAssassin (built-in)"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, c-format
+msgid "Failed to create pipe: %s"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, c-format
+msgid "Error after fork: %s"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+msgid "I_nclude remote tests"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
+msgid ""
+"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
+"to be installed."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
+msgid "SpamAssassin junk plugin"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+msgid "Spamassassin Options"
+msgstr ""
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
+msgid "A plugin for saving all attachments or parts of a message at once."
+msgstr ""
+
+#. the path to the shared library
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
+#: ../plugins/save-attachments/save-attachments.c:314
+msgid "Save attachments"
+msgstr "نښلنونه ساتل"
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
+msgid "Save Attachments..."
+msgstr "...نښلنونه ساتل"
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
+msgid "Save all attachments"
+msgstr "ټول نښلنونه ساتل"
+
+#: ../plugins/save-attachments/save-attachments.c:320
+msgid "Select save base name"
+msgstr "د ساتلو بنسټ نوم وټاکئ"
+
+#: ../plugins/save-attachments/save-attachments.c:339
+msgid "MIME Type"
+msgstr "ډول MIME"
+
+#: ../plugins/save-attachments/save-attachments.c:347
+msgid "Save"
+msgstr "ساتل"
+
+#.
+#. * Translator: the %F %T is the thirth argument for a strftime function.
+#. * It lets you define the formatting of the date in the csv-file.
+#. *
+#: ../plugins/save-calendar/csv-format.c:162
+msgid "%F %T"
+msgstr "%F %T"
+
+#: ../plugins/save-calendar/csv-format.c:360
+msgid "UID"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:362
+msgid "Description List"
+msgstr "د سپراړيو لړ"
+
+#: ../plugins/save-calendar/csv-format.c:363
+msgid "Categories List"
+msgstr "ټولۍ لړ"
+
+#: ../plugins/save-calendar/csv-format.c:364
+msgid "Comment List"
+msgstr "څرګندون لړ"
+
+#: ../plugins/save-calendar/csv-format.c:366
+msgid "Created"
+msgstr "جوړ شوی"
+
+#: ../plugins/save-calendar/csv-format.c:367
+msgid "Contact List"
+msgstr "اړيکلور لړ"
+
+#: ../plugins/save-calendar/csv-format.c:368
+msgid "Start"
+msgstr "پېلول"
+
+#: ../plugins/save-calendar/csv-format.c:369
+msgid "End"
+msgstr "پای"
+
+#: ../plugins/save-calendar/csv-format.c:371
+msgid "percent Done"
+msgstr "سلنه شوی"
+
+#: ../plugins/save-calendar/csv-format.c:373
+msgid "URL"
+msgstr "URL"
+
+#: ../plugins/save-calendar/csv-format.c:374
+msgid "Attendees List"
+msgstr "د ګډونوالو لړ"
+
+#: ../plugins/save-calendar/csv-format.c:376
+msgid "Modified"
+msgstr "بدل شوی"
+
+#: ../plugins/save-calendar/csv-format.c:531
+msgid "Advanced options for the CSV format"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:538
+msgid "Prepend a header"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:547
+msgid "Value delimiter:"
+msgstr ":ارزښت راچاپېرل"
+
+#: ../plugins/save-calendar/csv-format.c:553
+msgid "Record delimiter:"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:559
+msgid "Encapsulate values with:"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:581
+msgid "Comma separated value format (.csv)"
+msgstr ""
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+msgid "Save Selected"
+msgstr "ټاکل شوی ساتل"
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+msgid "Saves selected calendar or tasks list to disk."
+msgstr ""
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
+msgid "_Save to Disk"
+msgstr "ټيکلي کې ساتل_"
+
+#.
+#. * Translator: the %FT%T is the thirth argument for a strftime function.
+#. * It lets you define the formatting of the date in the rdf-file.
+#. * Also check out http://www.w3.org/2002/12/cal/tzd
+#. *
+#: ../plugins/save-calendar/rdf-format.c:149
+msgid "%FT%T"
+msgstr "%FT%T"
+
+#: ../plugins/save-calendar/rdf-format.c:376
+msgid "RDF format (.rdf)"
+msgstr ""
+
+#: ../plugins/save-calendar/save-calendar.c:160
+msgid "Select destination file"
+msgstr "موخه دوتنه وټاکئ"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
+msgid "Select one source"
+msgstr "يوه سرچينه وټاکئ"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
+msgid "Selects a single calendar or task source for viewing."
+msgstr ""
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
+msgid "Show _only this Calendar"
+msgstr "يوازې _دا کليز ښودل"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+msgid "Show _only this Memo List"
+msgstr "يوازې _دا ميمو لړ ښودل"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
+msgid "Show _only this Task List"
+msgstr "يوازې _دا دنده لړ ښودل"
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "A plugin that manages the Startup wizard."
+msgstr ""
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
+msgid "Startup wizard"
+msgstr "پېلنګ اسانګر"
+
+#: ../plugins/startup-wizard/startup-wizard.c:84
+msgid "Evolution Setup Assistant"
+msgstr "د اېوليوشن امستلو مرستيال"
+
+#: ../plugins/startup-wizard/startup-wizard.c:87
+msgid "Welcome"
+msgstr "ښه راغلاست"
+
+#: ../plugins/startup-wizard/startup-wizard.c:88
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"اېوليوشن ته ښه راغلاست. راتلونکي څو پړاونه به اېوليوشن پريږدي چې ستاسو ."
+"برېښليک ګڼونو سره ونښلي، او د نورو کاريالونو نه دوتنې ودننوي\n"
+"\n"
+".تڼۍ کېکاږﺉ \"Forward\" د پرمخبيولو لپاره"
+
+#: ../plugins/startup-wizard/startup-wizard.c:134
+msgid "Importing files"
+msgstr "دوتنې دننول کيږي"
+
+#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../shell/e-shell-importer.c:144
+msgid "Please select the information that you would like to import:"
+msgstr "لورينه وکړﺉ کومې خبرتياوې چې دننول غواړﺉ ويې ټاکئ:"
+
+#: ../plugins/startup-wizard/startup-wizard.c:151
+#: ../shell/e-shell-importer.c:397
+#, c-format
+msgid "From %s:"
+msgstr ":%s ‎له"
+
+#: ../plugins/startup-wizard/startup-wizard.c:231
+#: ../shell/e-shell-importer.c:508
+#, c-format
+msgid "Importing data."
+msgstr "اومتوک دننول کيږي."
+
+#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../shell/e-shell-importer.c:522
+msgid "Please wait"
+msgstr "لږه تمه وکړﺉ"
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
+msgid "Indicates if threading of messages should fall back to subject."
+msgstr ""
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
+msgid "Subject Threading"
+msgstr "سرليک مزونه"
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
+msgid "Thread messages by subject"
+msgstr "استوزې په سرليک مزول"
+
+#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
+#: ../plugins/subject-thread/subject-thread.c:54
+msgid "F_all back to threading messages by subject"
+msgstr ""
+
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+
+#: ../plugins/templates/templates.c:614
+#, fuzzy
+msgid "No title"
+msgstr "د دندې سرليک"
+
+#: ../plugins/templates/templates.c:743
+#, fuzzy
+msgid "Save as _Template"
+msgstr "لکه ګارليک ساتل"
+
+#: ../plugins/templates/templates.c:745
+#, fuzzy
+msgid "Save as Template"
+msgstr "لکه ګارليک ساتل"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr ""
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
+msgid "A simple plugin which uses ytnef to decode tnef attachments."
+msgstr ""
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "TNEF Attachment decoder"
+msgstr ""
+
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr ""
+
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell Config factory"
+msgstr ""
+
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "اېوليوشن ازموېنه"
+
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "اېوليوشن ازموېنې رغتوکی"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:1
+msgid "Authenticate proxy server connections"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:2
+msgid "Automatic proxy configuration URL"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Configuration version"
+msgstr "د سازونې نسخه"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:4
+msgid "Decides whether the crash detection should be run or not."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:5
+msgid "Default sidebar width"
+msgstr "د څنګپټې تلواله پلنوالی"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+msgid "Default window height"
+msgstr "د څنګپټې تلواله اوږدوالی"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
+msgid "Default window state"
+msgstr "د کړکۍ تلواله دريځ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid "Default window width"
+msgstr "د کړکۍ تلواله پلنوالی"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy password"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "HTTP proxy username"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username/password combo is defined by \"/apps/evolution/shell/network_config/"
+"authentication_user\" and locally stored password in .gnome2_private/."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid "Last upgraded configuration version"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Non-proxy hosts"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Proxy configuration mode"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "SOCKS proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Secure HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
+msgid "Sidebar is visible"
+msgstr "څنګپټه ښکاري"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+msgid "Skip development warning dialog"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:28
+msgid "Skip recovery warning dialog"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
+msgid "Start in offline mode"
+msgstr "په ناليکه اکر کې پېلول"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+msgid "Statusbar is visible"
+msgstr "انکړپټه ښکاري"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:31
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:32
+msgid "The default height for the main window, in pixels."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:33
+msgid "The default width for the main window, in pixels."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:34
+msgid "The default width for the sidebar, in pixels."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:35
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The machine name to proxy HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The machine name to proxy secure HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+msgid "The machine name to proxy socks through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
+msgid ""
+"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
+"by the GNOME toolbar setting."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "Toolbar is visible"
+msgstr "توکپټه ښکاري"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "URL that provides proxy configuration values."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+msgid "Use HTTP proxy"
+msgstr "ګوډاګی کارول HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:49
+msgid "Whether crash detection should be done or not"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:50
+msgid "Whether or not the window should be maximized."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:51
+msgid "Whether the sidebar should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:52
+msgid "Whether the status bar should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:53
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:54
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:55
+msgid "Whether the warning dialog in recovery of Evolution is skipped."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:56
+msgid "Whether the window buttons should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:57
+msgid "Window button style"
+msgstr "د کړکۍ تڼۍ ډول"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:58
+msgid "Window buttons are visible"
+msgstr "د کړکۍ تڼۍ ښکاري"
+
+#: ../shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr "<b>چارنده نښلېدنې</b>"
+
+#: ../shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "چارنده نښلېدنې"
+
+#: ../shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "هوکې کېکاږﺉ چې ټولې نښلېدنې بندې کړﺉ او ناليکه شئ"
+
+#: ../shell/e-shell-importer.c:132
+msgid "Choose the type of importer to run:"
+msgstr ":د ځغلولو لپاره د دننونکي ډول وټاکئ"
+
+#: ../shell/e-shell-importer.c:135
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#: ../shell/e-shell-importer.c:141
+msgid "Choose the destination for this import"
+msgstr "د دې دننونې لپاره موخه وټاکئ"
+
+#: ../shell/e-shell-importer.c:147
+msgid ""
+"Evolution checked for settings to import from the following\n"
+"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
+"settings found. If you would like to\n"
+"try again, please click the \"Back\" button.\n"
+msgstr ""
+
+#: ../shell/e-shell-importer.c:285
+msgid "F_ilename:"
+msgstr ":د_وتنه نوم"
+
+#: ../shell/e-shell-importer.c:290
+msgid "Select a file"
+msgstr "يوه دوتنه وټاکئ"
+
+#: ../shell/e-shell-importer.c:299
+msgid "File _type:"
+msgstr ":دوتنه _ډول"
+
+#: ../shell/e-shell-importer.c:335
+msgid "Import data and settings from _older programs"
+msgstr ""
+
+#: ../shell/e-shell-importer.c:338
+msgid "Import a _single file"
+msgstr "يوګړې _دوتنه دننول"
+
+#: ../shell/e-shell-settings-dialog.c:314
+msgid "Evolution Preferences"
+msgstr "د اېوليوشن غوراوي"
+
+#. To translators: This is the window title and %s is the
+#. component name. Most translators will want to keep it as is.
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
+#, c-format
+msgid "%s - Evolution"
+msgstr "اېوليوشن - %s"
+
+#: ../shell/e-shell-window-commands.c:75
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: ../shell/e-shell-window-commands.c:83
+#, c-format
+msgid "Error executing %s."
+msgstr ".په چلولو کې تېروتنه %s د"
+
+#: ../shell/e-shell-window-commands.c:139
+msgid "Bug buddy is not installed."
+msgstr ".کړاو ملګری نه دی لګول شوی"
+
+#: ../shell/e-shell-window-commands.c:142
+msgid "Bug buddy could not be run."
+msgstr ".کړاو ملګری نه شي ځغلېدی"
+
+#. The translator-credits string is for translators to list
+#. * per-language credits for translation, displayed in the
+#. * about dialog.
+#: ../shell/e-shell-window-commands.c:729
+msgid "translator-credits"
+msgstr ""
+"Zabeeh Khan <zabeehkhan@gmail.com>\n"
+"The Pathanisation Project <pathanisation@googlegroups.com>"
+
+#: ../shell/e-shell-window-commands.c:740
+msgid "Evolution Website"
+msgstr "د اېوليوشن ګورتپاڼه"
+
+#: ../shell/e-shell-window-commands.c:758
+msgid "Error opening the FAQ webpage."
+msgstr ".د بيابيا کېدونکو پوښتنو ګورتپاڼې په پرانيستلو کې تېروتنه"
+
+#: ../shell/e-shell-window-commands.c:955
+msgid "_Work Online"
+msgstr "پرليکه دنده کول_"
+
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:56
+msgid "_Work Offline"
+msgstr "ناليکه دنده کول_"
+
+#: ../shell/e-shell-window-commands.c:981
+msgid "Work Offline"
+msgstr "ناليکه دنده کول"
+
+#: ../shell/e-shell-window.c:377
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
+msgstr ""
+
+#: ../shell/e-shell-window.c:384
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: ../shell/e-shell-window.c:391
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+msgstr ""
+
+#: ../shell/e-shell-window.c:780
+#, c-format
+msgid "Switch to %s"
+msgstr "ته ونجول %s"
+
+#: ../shell/e-shell.c:638
+msgid "Unknown system error."
+msgstr "ناپېژندلې غونډال تېروتنه"
+
+#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
+#, c-format
+msgid "%ld KB"
+msgstr "ک ب %ld"
+
+#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:315
+msgid "OK"
+msgstr "هوکې"
+
+#: ../shell/e-shell.c:1280
+msgid "Invalid arguments"
+msgstr "ناسمې ارزښتمنۍ"
+
+#: ../shell/e-shell.c:1282
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: ../shell/e-shell.c:1284
+msgid "Configuration Database not found"
+msgstr ""
+
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
+msgid "New"
+msgstr "نوی"
+
+#: ../shell/test/evolution-test-component.c:107
+msgid "New Test"
+msgstr "نوې ازموېنه"
+
+#: ../shell/test/evolution-test-component.c:108
+msgid "_Test"
+msgstr "ازموېل_"
+
+#: ../shell/test/evolution-test-component.c:109
+msgid "Create a new test item"
+msgstr "نوی ازموېن توکی جوړول"
+
+#: ../shell/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ".کېکاږﺉ \"Import\" اېوليوشن ته د دوتنې دننونه پېلولو لپاره"
+
+#: ../shell/import.glade.h:2
+msgid "Evolution Import Assistant"
+msgstr "د اېوليوشن دننولو مرستيال"
+
+#: ../shell/import.glade.h:3
+msgid "Import File"
+msgstr "دوتنه دننول"
+
+#: ../shell/import.glade.h:4
+msgid "Import Location"
+msgstr "د دننولو ځای"
+
+#: ../shell/import.glade.h:5
+msgid "Importer Type"
+msgstr "د دننونکي ډول"
+
+#: ../shell/import.glade.h:6
+msgid "Select Importers"
+msgstr "دننونکي وټاکئ"
+
+#: ../shell/import.glade.h:7
+msgid "Select a File"
+msgstr "يوه دوتنه وټاکئ"
+
+#: ../shell/import.glade.h:8
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+"د اېوليوشن دننونکي مرستيال ته ښه راغلاست.\n"
+"دا مرستيال به تاسو ته د اېوليوشن ته د بهرنېو\n"
+".دوتنو دننولو لياره وښيي"
+
+#. Preview/Alpha/Beta version warning message
+#: ../shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Evolution groupware suite.\n"
+"\n"
+"This version of Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: ../shell/main.c:246
+msgid ""
+"Thanks\n"
+"The Evolution Team\n"
+msgstr ""
+"مننه\n"
+"د اېوليوشن ډله\n"
+
+#: ../shell/main.c:253
+msgid "Do not tell me again"
+msgstr "ما ته بيا مه وايه"
+
+#: ../shell/main.c:303
+msgid "Evolution Crash Detection"
+msgstr ""
+
+#: ../shell/main.c:305
+msgid "Ig_nore"
+msgstr "پر_ېښودل"
+
+#: ../shell/main.c:320
+#, no-c-format
+msgid ""
+"Evolution appears to have exited unexpectedly the last time it was\n"
+"run.  As a precautionary measure, all preview panes will be hidden.\n"
+"You can restore the preview panes from the View menu.\n"
+msgstr ""
+
+#: ../shell/main.c:331
+msgid "_Do not show this message again"
+msgstr "دا استوزه بيا نه ښودل_"
+
+#: ../shell/main.c:563
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: ../shell/main.c:567
+msgid "Start in online mode"
+msgstr "په پرليکه اکر کې پېلول"
+
+#: ../shell/main.c:570
+msgid "Forcibly shut down all Evolution components"
+msgstr ""
+
+#: ../shell/main.c:574
+msgid "Forcibly re-migrate from Evolution 1.4"
+msgstr ""
+
+#: ../shell/main.c:577
+msgid "Send the debugging output of all components to a file."
+msgstr ""
+
+#: ../shell/main.c:579
+msgid "Disable loading of any plugins."
+msgstr ".د ټولو لګونونو لېښنه ناتوانول"
+
+#: ../shell/main.c:581
+msgid "Disable preview pane of Mail, Contacts and Tasks."
+msgstr ""
+
+#: ../shell/main.c:666
+msgid "- The Evolution PIM and Email Client"
+msgstr ""
+
+#: ../shell/main.c:694
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:1
+msgid "Are you sure you want to forget all remembered passwords?"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:2
+msgid "Continue"
+msgstr "پرمخبيول"
+
+#: ../shell/shell.error.xml.h:3
+msgid "Delete old data from version {0}?"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:4
+msgid "Evolution can not start."
+msgstr ".اېوليوشن نه شي پېلېدی"
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:7
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:8
+msgid "Really delete old data?"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:9
+msgid ""
+"The entire contents of the &quot;evolution&quot; directory are about to be "
+"permanently removed.\n"
+"\n"
+"It is suggested you manually verify that all of your mail, contact, and "
+"calendar data is present, and that this version of Evolution operates "
+"correctly before deleting this old data.\n"
+"\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution "
+"without manual intervention.\n"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:15
+msgid ""
+"The previous version of evolution stored its data in a different location.\n"
+"\n"
+"If you choose to remove this data, the entire contents of the &quot;"
+"evolution&quot; directory will be removed permanently. If you choose to keep "
+"this data, then you may manually remove the contents of &quot;"
+"evolution&quot; at your convenience.\n"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:19
+msgid "Upgrade from previous version failed: {0}"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:20
+msgid ""
+"Upgrading your data and settings will require up to {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:23
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:26
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:31
+msgid "_Forget"
+msgstr "هېرول_"
+
+#: ../shell/shell.error.xml.h:32
+msgid "_Keep Data"
+msgstr "اومتوک ساتل_"
+
+#: ../shell/shell.error.xml.h:33
+msgid "_Remind Me Later"
+msgstr "وروسته خبرول_"
+
+#: ../shell/shell.error.xml.h:34
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+"{1}\n"
+"\n"
+"که چېرې تاسو پرمخبيول وټاکئ، کېدی شي چې تاسو خپل ځېنې زوړ اومتوک ته .لاسرسی "
+"ونه لرﺉ\n"
+
+#: ../smime/gui/ca-trust-dialog.c:102
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: ../smime/gui/cert-trust-dialog.c:151
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: ../smime/gui/cert-trust-dialog.c:155
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:137
+#: ../smime/gui/certificate-manager.c:380
+#: ../smime/gui/certificate-manager.c:604
+msgid "Select a certificate to import..."
+msgstr "...د دننولو لپاره برېليک وټاکئ"
+
+#: ../smime/gui/certificate-manager.c:146
+msgid "All PKCS12 files"
+msgstr "دوتنې PKCS۱۲ ټولې"
+
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:394
+#: ../smime/gui/certificate-manager.c:618
+msgid "All files"
+msgstr "ټولې دوتنې"
+
+#: ../smime/gui/certificate-manager.c:271
+#: ../smime/gui/certificate-manager.c:480
+#: ../smime/gui/certificate-manager.c:702
+msgid "Certificate Name"
+msgstr "د بريليک نوم"
+
+#: ../smime/gui/certificate-manager.c:280
+#: ../smime/gui/certificate-manager.c:498
+msgid "Purposes"
+msgstr "موخې"
+
+#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:570
+msgid "Serial Number"
+msgstr "لړیزه شمېره"
+
+#: ../smime/gui/certificate-manager.c:297
+msgid "Expires"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:389
+msgid "All email certificate files"
+msgstr "ټول برېښليک برېليک دوتنې"
+
+#: ../smime/gui/certificate-manager.c:489
+msgid "E-Mail Address"
+msgstr "برېښليک پته"
+
+#: ../smime/gui/certificate-manager.c:613
+msgid "All CA certificate files"
+msgstr "برېليک دوتنې CA ټولې"
+
+#: ../smime/gui/certificate-viewer.c:339
+#, c-format
+msgid "Certificate Viewer: %s"
+msgstr "%s :برېليک ليدانی"
+
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "لپاره تېرنويې وليکئ `%s' د"
+
+#. we're setting the password initially
+#: ../smime/gui/component.c:70
+msgid "Enter new password for certificate database"
+msgstr "د برېليک توکبنسټ لپاره نوې تېرنويې وليکئ"
+
+#: ../smime/gui/component.c:72
+msgid "Enter new password"
+msgstr "نوې تېرنويې وليکئ"
+
+#. FIXME: add serial no, validity date, uses
+#: ../smime/gui/e-cert-selector.c:115
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: ../smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: ../smime/gui/e-cert-selector.c:168
+msgid "Select certificate"
+msgstr "برېليک وټاکئ"
+
+#: ../smime/gui/smime-ui.glade.h:1
+msgid "<Not Part of Certificate>"
+msgstr "<د بريليک برخه نه دي>"
+
+#: ../smime/gui/smime-ui.glade.h:2
+msgid "<b>Certificate Fields</b>"
+msgstr "<b>برېليک ډګرونه</b>"
+
+#: ../smime/gui/smime-ui.glade.h:3
+msgid "<b>Certificate Hierarchy</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:4
+msgid "<b>Field Value</b>"
+msgstr "<b>ډګر ارزښت</b>"
+
+#: ../smime/gui/smime-ui.glade.h:5
+msgid "<b>Fingerprints</b>"
+msgstr "<b>ګوتنښې</b>"
+
+#: ../smime/gui/smime-ui.glade.h:6
+msgid "<b>Issued By</b>"
+msgstr "<b>لخوا ورکړل شوې</b>"
+
+#: ../smime/gui/smime-ui.glade.h:7
+msgid "<b>Issued To</b>"
+msgstr "<b>ته ورکړل شوې</b>"
+
+#: ../smime/gui/smime-ui.glade.h:8
+msgid "<b>This certificate has been verified for the following uses:</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:9
+msgid "<b>Validity</b>"
+msgstr "<b>باورکړن</b>"
+
+#: ../smime/gui/smime-ui.glade.h:10
+msgid "Authorities"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:11
+msgid "Backup"
+msgstr "شاتړول"
+
+#: ../smime/gui/smime-ui.glade.h:12
+msgid "Backup All"
+msgstr "ټول شاتړول"
+
+#: ../smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+msgid "Certificate"
+msgstr "برېليک"
+
+#: ../smime/gui/smime-ui.glade.h:15
+msgid "Certificate Authority Trust"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:16
+msgid "Certificate details"
+msgstr "د بريليک سپړاوي"
+
+#: ../smime/gui/smime-ui.glade.h:17
+msgid "Certificates Table"
+msgstr "د بريليکونو لښتيال"
+
+#: ../smime/gui/smime-ui.glade.h:18
+msgid "Common Name (CN)"
+msgstr "(CN) ټولګړی نوم"
+
+#: ../smime/gui/smime-ui.glade.h:19
+msgid "Contact Certificates"
+msgstr "اړيکلور بريليکونه"
+
+#: ../smime/gui/smime-ui.glade.h:21
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:23
+msgid "Edit"
+msgstr "سمون"
+
+#: ../smime/gui/smime-ui.glade.h:24
+msgid "Email Certificate Trust Settings"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:25
+msgid "Email Recipient Certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:26
+msgid "Email Signer Certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:27
+msgid "Expires On"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:29
+msgid "Import"
+msgstr "دننول"
+
+#: ../smime/gui/smime-ui.glade.h:30
+msgid "Issued On"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:31
+msgid "MD5 Fingerprint"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:32
+msgid "Organization (O)"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:33
+msgid "Organizational Unit (OU)"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:34
+msgid "SHA1 Fingerprint"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+msgid "SSL Client Certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+msgid "SSL Server Certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:38
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:40
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:41
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:42
+msgid "View"
+msgstr "ليد"
+
+#: ../smime/gui/smime-ui.glade.h:43
+msgid "You have certificates from these organizations that identify you:"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:44
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:45
+msgid "You have certificates on file that identify these people:"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:46
+msgid "Your Certificates"
+msgstr "ستاسو بريليکونه"
+
+#: ../smime/gui/smime-ui.glade.h:47
+msgid "_Edit CA Trust"
+msgstr ""
+
+#. XXX we shouldn't be popping up dialogs in this code.
+#: ../smime/lib/e-cert-db.c:672
+msgid "Certificate already exists"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#. x509 certificate usage types
+#: ../smime/lib/e-cert.c:425
+msgid "Sign"
+msgstr "نښه"
+
+#: ../smime/lib/e-cert.c:426
+msgid "Encrypt"
+msgstr "کوډه کښل"
+
+#: ../smime/lib/e-cert.c:531
+msgid "Version"
+msgstr "نسخه"
+
+#: ../smime/lib/e-cert.c:546
+msgid "Version 1"
+msgstr "۱ نسخه"
+
+#: ../smime/lib/e-cert.c:549
+msgid "Version 2"
+msgstr "۲ نسخه"
+
+#: ../smime/lib/e-cert.c:552
+msgid "Version 3"
+msgstr "۳ نسخه"
+
+#: ../smime/lib/e-cert.c:634
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:637
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:640
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:667
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:670
+msgid "Certificate Key Usage"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:673
+msgid "Netscape Certificate Type"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:676
+msgid "Certificate Authority Key Identifier"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:688
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:739
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:747
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:769
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:774
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:789
+msgid "Subject's Public Key"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+msgid "Error: Unable to process extension"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+msgid "Object Signer"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:835
+msgid "SSL Certificate Authority"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:839
+msgid "Email Certificate Authority"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:867
+msgid "Signing"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:871
+msgid "Non-repudiation"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:875
+msgid "Key Encipherment"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:879
+msgid "Data Encipherment"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:883
+msgid "Key Agreement"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:887
+msgid "Certificate Signer"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:891
+msgid "CRL Signer"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:939
+msgid "Critical"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+msgid "Not Critical"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:965
+msgid "Extensions"
+msgstr "شاتاړي"
+
+#: ../smime/lib/e-cert.c:1036
+#, c-format
+msgid "%s = %s"
+msgstr "%s = %s"
+
+#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+msgid "Certificate Signature Algorithm"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1101
+msgid "Issuer"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1155
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1174
+msgid "Subject Unique ID"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1217
+msgid "Certificate Signature Value"
+msgstr ""
+
+#: ../smime/lib/e-pkcs12.c:266
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: ../smime/lib/e-pkcs12.c:266
+msgid "Enter password for PKCS12 file:"
+msgstr ""
+
+#: ../smime/lib/e-pkcs12.c:365
+msgid "Imported Certificate"
+msgstr ""
+
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: ../tools/killev.c:61
+#, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "%s ‎:نه شي چلولی '%s'\n"
+
+#: ../tools/killev.c:76
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:1
+msgid "Address _Book Properties"
+msgstr "د پته _کتاب ځانتياوې"
+
+#: ../ui/evolution-addressbook.xml.h:3
+msgid "Change the properties of the selected folder"
+msgstr "د ټاکل شوې پوښۍ ځانتياوې بدلول"
+
+#: ../ui/evolution-addressbook.xml.h:4
+msgid "Co_py All Contacts To..."
+msgstr "...ته ټول اړيکلوري لم_ېسل"
+
+#: ../ui/evolution-addressbook.xml.h:5
+msgid "Contact _Preview"
+msgstr "د اړيکلوري _مخليد"
+
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "لمېسل"
+
+#: ../ui/evolution-addressbook.xml.h:7
+msgid "Copy Selected Contacts to Another Folder..."
+msgstr "...ټاکل شوي اړيکلوري بلې پوښۍ ته لمېسل"
+
+#: ../ui/evolution-addressbook.xml.h:8
+msgid "Copy the contacts of the selected folder into another folder"
+msgstr "د ټاکل شوې پوښۍ اړيکلوري بلې پوښۍ ته لمېسل"
+
+#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
+msgid "Copy the selection"
+msgstr "ټاکنه لمېسل"
+
+#: ../ui/evolution-addressbook.xml.h:10
+msgid "Copy to Folder..."
+msgstr "...پوښۍ ته لمېسل"
+
+#: ../ui/evolution-addressbook.xml.h:11
+msgid "Create a new addressbook folder"
+msgstr "نوې پته کتاب پوښۍ جوړول"
+
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "سکڼل"
+
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
+msgid "Cut the selection"
+msgstr "ټاکنه سکڼل"
+
+#: ../ui/evolution-addressbook.xml.h:14
+msgid "Del_ete Address Book"
+msgstr "پته کتاب ړن_ګول"
+
+#: ../ui/evolution-addressbook.xml.h:16
+msgid "Delete selected contacts"
+msgstr "ټاکل شوي اړيکلوري ړنګول"
+
+#: ../ui/evolution-addressbook.xml.h:17
+msgid "Delete the selected folder"
+msgstr "ټاکل شوې پوښۍ ړنګول"
+
+#: ../ui/evolution-addressbook.xml.h:18
+msgid "Forward Contact"
+msgstr "اړيکلوری مخکې کول"
+
+#: ../ui/evolution-addressbook.xml.h:19
+msgid "Mo_ve All Contacts To..."
+msgstr "...ته ټول اړيکلوري خو_ځول"
+
+#: ../ui/evolution-addressbook.xml.h:20
+msgid "Move Selected Contacts to Another Folder..."
+msgstr "...ټاکل شوي اړيکلوري بلې پوښۍ ته خوځول"
+
+#: ../ui/evolution-addressbook.xml.h:21
+msgid "Move the contacts of the selected folder into another folder"
+msgstr "د ټاکل شوې پوښۍ اړيکلوري بلې پوښۍ ته خوځول"
+
+#: ../ui/evolution-addressbook.xml.h:22
+msgid "Move to Folder..."
+msgstr "...پوښۍ ته خوځول"
+
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "سرېښل"
+
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "ټوټه دړه سرېښل"
+
+#: ../ui/evolution-addressbook.xml.h:25
+msgid "Previews the contacts to be printed"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:28
+msgid "Print selected contacts"
+msgstr "ټاکل شوي اړيکلوري چاپول"
+
+#: ../ui/evolution-addressbook.xml.h:29
+msgid "Rename the selected folder"
+msgstr "ټاکل شوې پوښۍ بيانومول"
+
+#: ../ui/evolution-addressbook.xml.h:30
+msgid "S_ave Address Book As VCard"
+msgstr "س_اتل ‎VCard ‎پته کتاب لکه"
+
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "...ساتل ‎VCard ‎لکه"
+
+#: ../ui/evolution-addressbook.xml.h:32
+msgid "Save selected contacts as a VCard."
+msgstr ".ساتل ‎VCard ‎ټاکل شوي اړيکلوري لکه"
+
+#: ../ui/evolution-addressbook.xml.h:33
+msgid "Save the contacts of the selected folder as VCard"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
+msgid "Select All"
+msgstr "ټول ټاکل"
+
+#: ../ui/evolution-addressbook.xml.h:35
+msgid "Select _All"
+msgstr "ټول ټاکل_"
+
+#: ../ui/evolution-addressbook.xml.h:36
+msgid "Select all contacts"
+msgstr "ټول اړيکلوري ټاکل"
+
+#: ../ui/evolution-addressbook.xml.h:37
+msgid "Send a message to the selected contacts."
+msgstr "ټاکل شويو اړيکلوريو ته استوزه لېږل"
+
+#: ../ui/evolution-addressbook.xml.h:38
+msgid "Send message to contact"
+msgstr "اړيکلوري ته استوزه لېږل"
+
+#: ../ui/evolution-addressbook.xml.h:39
+msgid "Send selected contacts to another person."
+msgstr ".ټاکل شوي اړيکلوري بل چا ته لېږل"
+
+#: ../ui/evolution-addressbook.xml.h:40
+msgid "Show contact preview window"
+msgstr "اړيکلوري مخليد کړکۍ ښودل"
+
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "St_op"
+msgstr "تم_ول"
+
+#: ../ui/evolution-addressbook.xml.h:42
+msgid "Stop"
+msgstr "تمول"
+
+#: ../ui/evolution-addressbook.xml.h:43
+msgid "Stop Loading"
+msgstr "لېښنه تمول"
+
+#: ../ui/evolution-addressbook.xml.h:44
+msgid "View the current contact"
+msgstr "اوسنی اړيکلوری ليدل"
+
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-tasks.xml.h:21
+msgid "_Actions"
+msgstr "چارې_"
+
+#: ../ui/evolution-addressbook.xml.h:47
+msgid "_Copy Contact to..."
+msgstr "...ته اړيکلوری لمېسل_"
+
+#: ../ui/evolution-addressbook.xml.h:48
+msgid "_Copy Folder Contacts To"
+msgstr "ته پوښۍ اړيکلوري لمېسل_"
+
+#: ../ui/evolution-addressbook.xml.h:50
+msgid "_Delete Contact"
+msgstr "اړيکلوری ړنګول_"
+
+#: ../ui/evolution-addressbook.xml.h:52
+msgid "_Forward Contact..."
+msgstr "اړيکلوری مخکې کول_"
+
+#: ../ui/evolution-addressbook.xml.h:53
+msgid "_Move Contact to..."
+msgstr "...ته اړيکلوری خوځول_"
+
+#: ../ui/evolution-addressbook.xml.h:54
+msgid "_Move Folder Contacts To"
+msgstr "ته پوښۍ اړيکلوري خوځول_"
+
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+msgid "_New"
+msgstr "نوی_"
+
+#: ../ui/evolution-addressbook.xml.h:60
+msgid "_Rename"
+msgstr "بيانومول_"
+
+#: ../ui/evolution-addressbook.xml.h:61
+msgid "_Save Contact as VCard..."
+msgstr "...ساتل ‎VCard ‎اړيکلوری لکه_"
+
+#: ../ui/evolution-addressbook.xml.h:62
+msgid "_Save Folder Contacts As VCard"
+msgstr "ساتل VCard پوښۍ اړيکلوري لکه_"
+
+#: ../ui/evolution-addressbook.xml.h:63
+msgid "_Send Message to Contact..."
+msgstr "...اړيلکوري ته استوزه لېږل_"
+
+#: ../ui/evolution-calendar.xml.h:4
+msgid "Day"
+msgstr "ورځ"
+
+#: ../ui/evolution-calendar.xml.h:6
+msgid "Delete _all Occurrences"
+msgstr "ټولې _پېښېدنې ړنګول"
+
+#: ../ui/evolution-calendar.xml.h:7
+msgid "Delete all occurrences"
+msgstr "ټولې پېښېدنې ړنګول"
+
+#: ../ui/evolution-calendar.xml.h:8
+msgid "Delete the appointment"
+msgstr "ټاکنه ړنګول"
+
+#: ../ui/evolution-calendar.xml.h:10
+msgid "Delete this occurrence"
+msgstr "دا پېښېدنه ړنګول"
+
+#: ../ui/evolution-calendar.xml.h:11
+msgid "Go To"
+msgstr "ته ورتلل"
+
+#: ../ui/evolution-calendar.xml.h:12
+msgid "Go back"
+msgstr "وروسته تلل"
+
+#: ../ui/evolution-calendar.xml.h:13
+msgid "Go forward"
+msgstr "مخکې تلل"
+
+#: ../ui/evolution-calendar.xml.h:14
+msgid "List"
+msgstr "لړ"
+
+#: ../ui/evolution-calendar.xml.h:15
+msgid "Month"
+msgstr "مياشت"
+
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
+#: ../widgets/misc/e-calendar.c:196
+msgid "Next"
+msgstr "راتلونکی"
+
+#: ../ui/evolution-calendar.xml.h:18
+msgid "Previews the calendar to be printed"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:172
+msgid "Previous"
+msgstr "مخکنی"
+
+#: ../ui/evolution-calendar.xml.h:22
+msgid "Print this calendar"
+msgstr "دا کليز چاپول"
+
+#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+msgid "Purg_e"
+msgstr "ړنګو_ل"
+
+#: ../ui/evolution-calendar.xml.h:24
+msgid "Purge old appointments and meetings"
+msgstr "زړې ټاکنې او کتنې ړنګول"
+
+#: ../ui/evolution-calendar.xml.h:25
+msgid "Select _Date"
+msgstr "نېټه _ټاکل"
+
+#: ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
+msgstr "نن _ټاکل"
+
+#: ../ui/evolution-calendar.xml.h:27
+msgid "Select a specific date"
+msgstr "کومه ځانګړې نېټه ټاکل"
+
+#: ../ui/evolution-calendar.xml.h:28
+msgid "Select today"
+msgstr "نن ټاکل"
+
+#: ../ui/evolution-calendar.xml.h:29
+msgid "Show as list"
+msgstr "لکه لړ ښودل"
+
+#: ../ui/evolution-calendar.xml.h:30
+msgid "Show one day"
+msgstr "يوه ورځ ښودل"
+
+#: ../ui/evolution-calendar.xml.h:31
+msgid "Show one month"
+msgstr "يوه مياشت ښودل"
+
+#: ../ui/evolution-calendar.xml.h:32
+msgid "Show one week"
+msgstr "يوه اونۍ ښودل"
+
+#: ../ui/evolution-calendar.xml.h:33
+msgid "Show the working week"
+msgstr "دنده اونۍ ښودل"
+
+#: ../ui/evolution-calendar.xml.h:35
+msgid "View the current appointment"
+msgstr "اوسنۍ ټاکنه ښودل"
+
+#: ../ui/evolution-calendar.xml.h:36
+msgid "Week"
+msgstr "اونۍ"
+
+#: ../ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "دنده اونۍ"
+
+#: ../ui/evolution-calendar.xml.h:42
+msgid "_Open Appointment"
+msgstr "ټاکنه پرانيستل_"
+
+#: ../ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
+msgstr "اوسنی ليک چلښت بندول"
+
+#: ../ui/evolution-mail-global.xml.h:3
+msgid "Copy the selected folder into another folder"
+msgstr "ټاکل شوې پوښۍ بلې پوښۍ ته لمېسل"
+
+#: ../ui/evolution-mail-global.xml.h:4
+msgid "Create a new folder for storing mail"
+msgstr "د ليک د زېرملو لپاره نوې پوښۍ جوړول"
+
+#: ../ui/evolution-mail-global.xml.h:5
+msgid "Create or edit Search Folder definitions"
+msgstr "د پلټون پوښېو پېژنداوي جوړول يا سمول"
+
+#: ../ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:7
+msgid "Download messages of accounts/folders marked for offline"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "خځلنۍ _تشول"
+
+#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
+msgid "F_older"
+msgstr "پ_وښۍ"
+
+#: ../ui/evolution-mail-global.xml.h:10
+msgid "Move the selected folder into another folder"
+msgstr "ټاکل شوې پوښۍ بلې پوښۍ ته خوځول"
+
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-global.xml.h:12
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "د ټولو پوښېو نه ټولې ړنګېدلې استوزې د تل لپاره ړنګول"
+
+#: ../ui/evolution-mail-global.xml.h:13
+msgid "Search F_olders"
+msgstr "پوښۍ پ_لټل"
+
+#: ../ui/evolution-mail-global.xml.h:14
+msgid "Show Message _Preview"
+msgstr "د استوزې _مخليد ښودل"
+
+#: ../ui/evolution-mail-global.xml.h:15
+msgid "Show message preview below the message list"
+msgstr "د استوزه لړ نه لاندې استوزه مخليد ښودل"
+
+#: ../ui/evolution-mail-global.xml.h:16
+msgid "Show message preview side-by-side with the message list"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:17
+msgid "Show message preview window"
+msgstr "استوزه مخکوت کړکۍ ښودل"
+
+#: ../ui/evolution-mail-global.xml.h:18
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:20
+msgid "_Classic View"
+msgstr "لرغیز لید_"
+
+#: ../ui/evolution-mail-global.xml.h:21
+msgid "_Copy Folder To..."
+msgstr "...ته پوښۍ لمېسل_"
+
+#: ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "کړاوتمبونې خبرالونه_"
+
+#: ../ui/evolution-mail-global.xml.h:23
+msgid "_Download Messages for Offline Usage"
+msgstr "د ناليکې کارونې لپاره استوزې رالېښل_"
+
+#: ../ui/evolution-mail-global.xml.h:25
+msgid "_Message Filters"
+msgstr "استوزه چاڼونه_"
+
+#: ../ui/evolution-mail-global.xml.h:26
+msgid "_Move Folder To..."
+msgstr "...ته پوښۍ خوځول_"
+
+#: ../ui/evolution-mail-global.xml.h:27
+msgid "_New..."
+msgstr "...نوی_"
+
+#: ../ui/evolution-mail-global.xml.h:28
+msgid "_Preview"
+msgstr "مخليد_"
+
+#.
+#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
+#.
+#: ../ui/evolution-mail-global.xml.h:32
+msgid "_Subscriptions"
+msgstr "ګډونونه_"
+
+#: ../ui/evolution-mail-global.xml.h:33
+msgid "_Vertical View"
+msgstr "نېغ ليد_"
+
+#: ../ui/evolution-mail-list.xml.h:1
+msgid "Change the name of this folder"
+msgstr "د دې پوښۍ نوم بدلول"
+
+#: ../ui/evolution-mail-list.xml.h:2
+msgid "Change the properties of this folder"
+msgstr "د دې پوښۍ ځانتياوې بدلول"
+
+#: ../ui/evolution-mail-list.xml.h:3
+msgid "Collapse All _Threads"
+msgstr "ټول _مزي وېجاړول"
+
+#: ../ui/evolution-mail-list.xml.h:4
+msgid "Collapse all message threads"
+msgstr "ټول استوزه مزي وېجاړول"
+
+#: ../ui/evolution-mail-list.xml.h:5
+msgid "Copy selected message(s) to the clipboard"
+msgstr ""
+
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-list.xml.h:7
+msgid "Cut selected message(s) to the clipboard"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:8
+msgid "E_xpand All Threads"
+msgstr "ټول مزي غ_ځول"
+
+#: ../ui/evolution-mail-list.xml.h:9
+msgid "E_xpunge"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:10
+msgid "Expand all message threads"
+msgstr "ټول استوزه مزي غځول"
+
+#: ../ui/evolution-mail-list.xml.h:12
+msgid "Hide S_elected Messages"
+msgstr "ټ_اکل شوې استوزې پټول"
+
+#: ../ui/evolution-mail-list.xml.h:13
+msgid "Hide _Deleted Messages"
+msgstr "ړنګېدلې _استوزې پټول"
+
+#: ../ui/evolution-mail-list.xml.h:14
+msgid "Hide _Read Messages"
+msgstr "لوستې _استوزې پټول"
+
+#: ../ui/evolution-mail-list.xml.h:15
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:16
+msgid "Mar_k All Messages as Read"
+msgstr "ټولې استوزې لکه لوستې ن_ښول"
+
+#: ../ui/evolution-mail-list.xml.h:17
+msgid "Mark all messages in the folder as read"
+msgstr "د پوښۍ ټولې استوزې لکه لوستې نښول"
+
+#: ../ui/evolution-mail-list.xml.h:18
+msgid "Paste message(s) from the clipboard"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:19
+msgid "Permanently remove all deleted messages from this folder"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:20
+msgid "Permanently remove this folder"
+msgstr "دا پوښۍ د تل لپاره ړنګول"
+
+#: ../ui/evolution-mail-list.xml.h:21
+msgid "Re_fresh..."
+msgstr "...بيا_تاندول"
+
+#: ../ui/evolution-mail-list.xml.h:22
+msgid "Refresh the folder"
+msgstr "پوښۍ تاندول"
+
+#: ../ui/evolution-mail-list.xml.h:23
+msgid "Select Message S_ubthread"
+msgstr "څ_ېرمه استوزه مزی ټاکل"
+
+#: ../ui/evolution-mail-list.xml.h:24
+msgid "Select Message _Thread"
+msgstr "استوزه _مزی ټاکل"
+
+#: ../ui/evolution-mail-list.xml.h:25
+msgid "Select _All Messages"
+msgstr "ټولې _استوزې ټاکل"
+
+#: ../ui/evolution-mail-list.xml.h:26
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:27
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:28
+msgid "Select all replies to the currently selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:29
+msgid "Select all visible messages"
+msgstr "ټولې ښکارېدونکې استوزې ټاکل"
+
+#: ../ui/evolution-mail-list.xml.h:30
+msgid "Show Hidde_n Messages"
+msgstr "پټې اس_توزې ښودل"
+
+#: ../ui/evolution-mail-list.xml.h:31
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:32
+msgid "Temporarily hide all messages that have already been read"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:33
+msgid "Temporarily hide the selected messages"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:34
+msgid "Threaded Message list"
+msgstr "مزېدلی استوزه لړ"
+
+#: ../ui/evolution-mail-list.xml.h:36
+msgid "_Group By Threads"
+msgstr "په مزو ډلول_"
+
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-messagedisplay.xml.h:7
+msgid "_Message"
+msgstr "استوزه_"
+
+#: ../ui/evolution-mail-message.xml.h:1
+msgid "A_dd Sender to Address Book"
+msgstr "استوونی پته کتاب کې ز_ياتول"
+
+#: ../ui/evolution-mail-message.xml.h:2
+msgid "A_pply Filters"
+msgstr "چ_اڼونه کارول"
+
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-message.xml.h:4
+msgid "Add Sender to Address Book"
+msgstr "استوونی پته کتاب کې زياتول"
+
+#: ../ui/evolution-mail-message.xml.h:5
+msgid "All Message _Headers"
+msgstr "ټول استوزه _سريزې"
+
+#: ../ui/evolution-mail-message.xml.h:6
+msgid "Apply filter rules to the selected messages"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:7
+msgid "Check for _Junk"
+msgstr "سر_کودن لپاره کتل"
+
+#: ../ui/evolution-mail-message.xml.h:8
+msgid "Compose _New Message"
+msgstr "نوې _استوزه ليکل"
+
+#: ../ui/evolution-mail-message.xml.h:9
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:10
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:11
+msgid "Compose a reply to the sender of the selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:12
+msgid "Copy selected messages to another folder"
+msgstr "ټاکل شوې استوزې بلې پوښۍ ته لمېسل"
+
+#: ../ui/evolution-mail-message.xml.h:13
+msgid "Copy selected messages to the clipboard"
+msgstr "ټاکل شوې استوزې ټوټه دړې ته لمېسل"
+
+#: ../ui/evolution-mail-message.xml.h:14
+msgid "Create R_ule"
+msgstr "د_وی جوړول"
+
+#: ../ui/evolution-mail-message.xml.h:15
+msgid "Create a Search Folder for these recipients"
+msgstr "د دې ترلاسه کوونکو لپاره يوه پلټون پوښۍ جوړول"
+
+#: ../ui/evolution-mail-message.xml.h:16
+msgid "Create a Search Folder for this mailing list"
+msgstr "د دې ليک لړ لپاره يوه پلټون پوښۍ جوړول"
+
+#: ../ui/evolution-mail-message.xml.h:17
+msgid "Create a Search Folder for this sender"
+msgstr "د دې استووني لپاره يوه پلټون پوښۍ جوړول"
+
+#: ../ui/evolution-mail-message.xml.h:18
+msgid "Create a Search Folder for this subject"
+msgstr "د دې سرليک لپاره يوه پلټون پوښۍ جوړول"
+
+#: ../ui/evolution-mail-message.xml.h:19
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:20
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:21
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:22
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:23
+msgid "Cut selected messages to the clipboard"
+msgstr "ټاکل شوې استوزې ټوټه دړې ته سکڼل"
+
+#: ../ui/evolution-mail-message.xml.h:24
+msgid "Decrease the text size"
+msgstr "د ليکنې کچ لږول"
+
+#: ../ui/evolution-mail-message.xml.h:26
+msgid "Display the next important message"
+msgstr "راتلونکې اړينه استوزه ښودل"
+
+#: ../ui/evolution-mail-message.xml.h:27
+msgid "Display the next message"
+msgstr "راتلونکې استوزه ښودل"
+
+#: ../ui/evolution-mail-message.xml.h:28
+msgid "Display the next thread"
+msgstr "راتلونکی مزی ښودل"
+
+#: ../ui/evolution-mail-message.xml.h:29
+msgid "Display the next unread message"
+msgstr "راتلونکې نالوستې استوزه ښودل"
+
+#: ../ui/evolution-mail-message.xml.h:30
+msgid "Display the previous important message"
+msgstr "مخکنۍ اړينه استوزه ښودل"
+
+#: ../ui/evolution-mail-message.xml.h:31
+msgid "Display the previous message"
+msgstr "مخکنۍ استوزه ښودل"
+
+#: ../ui/evolution-mail-message.xml.h:32
+msgid "Display the previous unread message"
+msgstr "مخکنۍ نالوستې استوزه ښودل"
+
+#: ../ui/evolution-mail-message.xml.h:33
+msgid "F_orward As..."
+msgstr "...م_خکې کول لکه"
+
+#: ../ui/evolution-mail-message.xml.h:34
+msgid "Filter on Mailing _List..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:35
+msgid "Filter on Se_nder..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:36
+msgid "Filter on _Recipients..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:37
+msgid "Filter on _Subject..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:38
+msgid "Filter the selected messages for junk status"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:39
+msgid "Flag selected messages for follow-up"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:40
+msgid "Follow _Up..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:41
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:43
+msgid "Forward the selected message in the body of a new message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:44
+msgid "Forward the selected message quoted like a reply"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:45
+msgid "Forward the selected message to someone"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:46
+msgid "Forward the selected message to someone as an attachment"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:47
+msgid "Increase the text size"
+msgstr "د ليکنې کچ ډېرول"
+
+#: ../ui/evolution-mail-message.xml.h:49
+msgid "Mar_k as"
+msgstr "نښو_ل لکه"
+
+#: ../ui/evolution-mail-message.xml.h:50
+msgid "Mark the selected messages as having been read"
+msgstr "ټاکل شوې استوزې داسې نښول لکه چې لوستل شوې وي"
+
+#: ../ui/evolution-mail-message.xml.h:51
+msgid "Mark the selected messages as important"
+msgstr "ټاکل شوې استوزې لکه اړينې نښول"
+
+#: ../ui/evolution-mail-message.xml.h:52
+msgid "Mark the selected messages as junk"
+msgstr "ټاکل شوې استوزې لکه سرکودنې نښول"
+
+#: ../ui/evolution-mail-message.xml.h:53
+msgid "Mark the selected messages as not being junk"
+msgstr "ټاکل شوې استوزې داسې نښول لکه چې سرکودن نه وي"
+
+#: ../ui/evolution-mail-message.xml.h:54
+msgid "Mark the selected messages as not having been read"
+msgstr "ټاکل شوې استوزې داسې نښول لکه چې نه وي لوستل شوي"
+
+#: ../ui/evolution-mail-message.xml.h:55
+msgid "Mark the selected messages as unimportant"
+msgstr "ټاکل شوې استوزې لکه نااړينې نښول"
+
+#: ../ui/evolution-mail-message.xml.h:56
+msgid "Mark the selected messages for deletion"
+msgstr "ټاکل شوې استوزې د ړنګولو لپاره نښول"
+
+#: ../ui/evolution-mail-message.xml.h:57
+msgid "Move selected messages to another folder"
+msgstr "ټاکل شوې استوزې بلې پوښۍ ته خوځول"
+
+#: ../ui/evolution-mail-message.xml.h:59
+msgid "Next _Important Message"
+msgstr "راتلونکې _اړينه استوزه"
+
+#: ../ui/evolution-mail-message.xml.h:60
+msgid "Next _Thread"
+msgstr "راتلونکی _مزی"
+
+#: ../ui/evolution-mail-message.xml.h:61
+msgid "Next _Unread Message"
+msgstr "راتلونکې _نالوستې استوزه"
+
+#: ../ui/evolution-mail-message.xml.h:62
+msgid "Not Junk"
+msgstr "نا سرکودن"
+
+#: ../ui/evolution-mail-message.xml.h:63
+msgid "Open a window for composing a mail message"
+msgstr "د ليک استوزې د ليکلو لپاره کړکۍ پرانيستل"
+
+#: ../ui/evolution-mail-message.xml.h:64
+msgid "Open the selected messages in a new window"
+msgstr "ټاکل شوې استوزې په نوې کړکۍ کې پرانيستل"
+
+#: ../ui/evolution-mail-message.xml.h:65
+msgid "Open the selected messages in the composer for editing"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:66
+msgid "P_revious Unread Message"
+msgstr "م_خکنۍ نالوستې استوزه"
+
+#: ../ui/evolution-mail-message.xml.h:67
+msgid "Paste messages from the clipboard"
+msgstr "له ټوټه دړې استوزې سرېښل"
+
+#: ../ui/evolution-mail-message.xml.h:68
+msgid "Pos_t New Message to Folder"
+msgstr "پوښۍ ته نوې استوزه ل_ېږل"
+
+#: ../ui/evolution-mail-message.xml.h:69
+msgid "Post a Repl_y"
+msgstr "ځواب ل_ېږل"
+
+#: ../ui/evolution-mail-message.xml.h:70
+msgid "Post a message to a Public folder"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:71
+msgid "Post a reply to a message in a Public folder"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:72
+msgid "Pr_evious Important Message"
+msgstr "مخ_کنۍ اړينه استوزه"
+
+#: ../ui/evolution-mail-message.xml.h:73
+msgid "Preview the message to be printed"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:77
+msgid "Print this message"
+msgstr "دا استوزه چاپول"
+
+#: ../ui/evolution-mail-message.xml.h:78
+msgid "Re_direct"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:79
+msgid "Redirect (bounce) the selected message to someone"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:84
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:85
+msgid "Save the selected messages as a text file"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:86
+msgid "Search Folder from Mailing _List..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:87
+msgid "Search Folder from Recipien_ts..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:88
+msgid "Search Folder from S_ubject..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:89
+msgid "Search Folder from Sen_der..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:90
+msgid "Search for text in the body of the displayed message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:91
+msgid "Select _All Text"
+msgstr "ټوله _ليکنه ټاکل"
+
+#: ../ui/evolution-mail-message.xml.h:92
+msgid "Select all the text in a message"
+msgstr "په کومې استوزه کې ټوله ليکنه ټاکل"
+
+#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+msgid "Set up the page settings for your current printer"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:94
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:95
+msgid "Show messages in the normal style"
+msgstr "استوزې په لېوي ډول ښودل"
+
+#: ../ui/evolution-mail-message.xml.h:96
+msgid "Show messages with all email headers"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:97
+msgid "Show the raw email source of the message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:98
+msgid "Undelete the selected messages"
+msgstr "ټاکل شوې استوزې ناړنګول"
+
+#: ../ui/evolution-mail-message.xml.h:99
+msgid "Uni_mportant"
+msgstr "نا_اړين"
+
+#: ../ui/evolution-mail-message.xml.h:100
+msgid "Zoom _Out"
+msgstr "لو_کمول"
+
+#: ../ui/evolution-mail-message.xml.h:101
+msgid "_Attached"
+msgstr "نښلېدلی_"
+
+#: ../ui/evolution-mail-message.xml.h:102
+msgid "_Caret Mode"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:103
+msgid "_Clear Flag"
+msgstr "جنډه پاکول_"
+
+#: ../ui/evolution-mail-message.xml.h:106
+msgid "_Delete Message"
+msgstr "استوزه ړنګول_"
+
+#: ../ui/evolution-mail-message.xml.h:108
+msgid "_Find in Message..."
+msgstr "...په استوزه کې لټول_"
+
+#: ../ui/evolution-mail-message.xml.h:109
+msgid "_Flag Completed"
+msgstr "جنډه بشپړه شوه_"
+
+#: ../ui/evolution-mail-message.xml.h:111
+msgid "_Go To"
+msgstr "ته ورتلل_"
+
+#: ../ui/evolution-mail-message.xml.h:112
+msgid "_Important"
+msgstr "اړين_"
+
+#: ../ui/evolution-mail-message.xml.h:113
+msgid "_Inline"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:114
+msgid "_Junk"
+msgstr "سرکودن_"
+
+#: ../ui/evolution-mail-message.xml.h:115
+msgid "_Load Images"
+msgstr "انځورونه لېښل_"
+
+#: ../ui/evolution-mail-message.xml.h:117
+msgid "_Message Source"
+msgstr "د استوزې سرچينه_"
+
+#: ../ui/evolution-mail-message.xml.h:119
+msgid "_Next Message"
+msgstr "راتلونکې استوزه_"
+
+#: ../ui/evolution-mail-message.xml.h:120
+msgid "_Normal Size"
+msgstr "لېوی کچ_"
+
+#: ../ui/evolution-mail-message.xml.h:121
+msgid "_Not Junk"
+msgstr "نا سرکودن_"
+
+#: ../ui/evolution-mail-message.xml.h:122
+msgid "_Open in New Window"
+msgstr "په نوې کړکۍ کې پرانيستل_"
+
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Previous Message"
+msgstr "مخکنۍ استوزه_"
+
+#: ../ui/evolution-mail-message.xml.h:125
+msgid "_Quoted"
+msgstr ""
+
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:127
+msgid "_Read"
+msgstr "لوستی_"
+
+#: ../ui/evolution-mail-message.xml.h:129
+msgid "_Save Message..."
+msgstr "...استوزه ساتل_"
+
+#: ../ui/evolution-mail-message.xml.h:130
+msgid "_Undelete Message"
+msgstr "استوزه ناړنګول_"
+
+#: ../ui/evolution-mail-message.xml.h:131
+msgid "_Unread"
+msgstr "نالوستی_"
+
+#: ../ui/evolution-mail-message.xml.h:132
+msgid "_Zoom"
+msgstr "لويول_"
+
+#: ../ui/evolution-mail-message.xml.h:133
+msgid "_Zoom In"
+msgstr "لوډېرول_"
+
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "بندول"
+
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
+msgid "Main toolbar"
+msgstr "اره توکپټه"
+
+#: ../ui/evolution-memos.xml.h:3
+msgid "Copy selected memo"
+msgstr "ټاکل شوې ميمو لمېسل"
+
+#: ../ui/evolution-memos.xml.h:5
+msgid "Cut selected memo"
+msgstr "ټاکل شوې ميمو سکڼل"
+
+#: ../ui/evolution-memos.xml.h:7
+msgid "Delete selected memos"
+msgstr "ټاکل شوي ميموګانې ړنګول"
+
+#: ../ui/evolution-memos.xml.h:9
+msgid "Paste memo from the clipboard"
+msgstr "له ټوټه دړې ميمو سرېښل"
+
+#: ../ui/evolution-memos.xml.h:10
+msgid "Previews the list of memos to be printed"
+msgstr ""
+
+#: ../ui/evolution-memos.xml.h:13
+msgid "Print the list of memos"
+msgstr "د ميموګانو لړ چاپول"
+
+#: ../ui/evolution-memos.xml.h:14
+msgid "View the selected memo"
+msgstr "ټاکل شوې ميمو ليدل"
+
+#: ../ui/evolution-memos.xml.h:18
+msgid "_Open Memo"
+msgstr "ميمو پرانيستل_"
+
+#: ../ui/evolution-tasks.xml.h:3
+msgid "Copy selected tasks"
+msgstr "ټاکل شوې دندې لمېسل"
+
+#: ../ui/evolution-tasks.xml.h:5
+msgid "Cut selected tasks"
+msgstr "ټاکل شوې دندې سکڼل"
+
+#: ../ui/evolution-tasks.xml.h:7
+msgid "Delete completed tasks"
+msgstr "بشپړې شوې دندې ړنګول"
+
+#: ../ui/evolution-tasks.xml.h:8
+msgid "Delete selected tasks"
+msgstr "ټاکل شوې دندې ړنګول"
+
+#: ../ui/evolution-tasks.xml.h:9
+msgid "Mar_k as Complete"
+msgstr "لکه بشپړ نښو_ل"
+
+#: ../ui/evolution-tasks.xml.h:10
+msgid "Mark selected tasks as complete"
+msgstr "ټاکل شوې دندې لکه بشپړې نښول"
+
+#: ../ui/evolution-tasks.xml.h:12
+msgid "Paste tasks from the clipboard"
+msgstr "له ټوټه ډړې دندې سرېښل"
+
+#: ../ui/evolution-tasks.xml.h:13
+msgid "Previews the list of tasks to be printed"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:16
+msgid "Print the list of tasks"
+msgstr "د دندو لړ چاپول"
+
+#: ../ui/evolution-tasks.xml.h:18
+msgid "Show task preview window"
+msgstr "دنده مخليد کړکۍ ښودل"
+
+#: ../ui/evolution-tasks.xml.h:19
+msgid "Task _Preview"
+msgstr "دنده _مخليد"
+
+#: ../ui/evolution-tasks.xml.h:20
+msgid "View the selected task"
+msgstr "ټاکل شوې دنده ليدل"
+
+#: ../ui/evolution-tasks.xml.h:27
+msgid "_Open Task"
+msgstr "دنده پرانيستل_"
+
+#: ../ui/evolution.xml.h:1
+msgid "About Evolution..."
+msgstr "...د اېوليوشن په اړه"
+
+#: ../ui/evolution.xml.h:2
+msgid "Change Evolution's settings"
+msgstr "د اېوليوشن امستنې بدلول"
+
+#: ../ui/evolution.xml.h:3
+msgid "Change the visibility of the toolbar"
+msgstr "د توکپټې ښکارېدنه بدلول"
+
+#: ../ui/evolution.xml.h:5
+msgid "Create a new window displaying this folder"
+msgstr ""
+
+#: ../ui/evolution.xml.h:6
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr "د کړکۍ تڼۍ د سرپاڼه توکپټې د امستنې په کارولو سره ښودل"
+
+#: ../ui/evolution.xml.h:7
+msgid "Display window buttons with icons and text"
+msgstr "د کړکۍ تڼۍ د انځورنونو او ليکنې سره ښودل"
+
+#: ../ui/evolution.xml.h:8
+msgid "Display window buttons with icons only"
+msgstr "د کړکۍ تڼۍ يوازې د انځورنونو سره ښودل"
+
+#: ../ui/evolution.xml.h:9
+msgid "Display window buttons with text only"
+msgstr "د کړکۍ تڼۍ يوازې د ليکنې سره ښودل"
+
+#: ../ui/evolution.xml.h:10
+msgid "Evolution _FAQ"
+msgstr "د اېوليوشن په اړه بيابيا کېدونکې پوښتنې"
+
+#: ../ui/evolution.xml.h:11
+msgid "Exit the program"
+msgstr "کړنلار بندول"
+
+#: ../ui/evolution.xml.h:12
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
+
+#: ../ui/evolution.xml.h:13
+msgid "Hide window buttons"
+msgstr "د کړکۍ تڼۍ پټول"
+
+#: ../ui/evolution.xml.h:14
+msgid "I_mport..."
+msgstr "...د_ننول"
+
+#: ../ui/evolution.xml.h:15
+msgid "Icons _and Text"
+msgstr "انځورنونه _او ليکنه"
+
+#: ../ui/evolution.xml.h:16
+msgid "Import data from other programs"
+msgstr "د نورو کړنلارو نه اومتوک دننول"
+
+#: ../ui/evolution.xml.h:17
+msgid "Lay_out"
+msgstr "هډو_انه"
+
+#: ../ui/evolution.xml.h:19
+msgid "New _Window"
+msgstr "نوې _کړکۍ"
+
+#: ../ui/evolution.xml.h:20
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "د بيابيا کېدونکو پوښتنو ګورتپاڼه پرانيستل "
+
+#: ../ui/evolution.xml.h:21
+msgid "Page Set_up..."
+msgstr "...مخ امس_ته"
+
+#: ../ui/evolution.xml.h:22
+msgid "Prefere_nces"
+msgstr "غور_اوي"
+
+#: ../ui/evolution.xml.h:23
+msgid "Send / Receive"
+msgstr "لېږل / راوستل"
+
+#: ../ui/evolution.xml.h:24
+msgid "Send / _Receive"
+msgstr "لېږل / _راوستل"
+
+#: ../ui/evolution.xml.h:25
+msgid "Send queued items and retrieve new items"
+msgstr ""
+
+#: ../ui/evolution.xml.h:26
+msgid "Set up Pilot configuration"
+msgstr ""
+
+#: ../ui/evolution.xml.h:28
+msgid "Show Side _Bar"
+msgstr "څنګ _پټه ښودل"
+
+#: ../ui/evolution.xml.h:29
+msgid "Show _Status Bar"
+msgstr "انکړ _پټه ښودل"
+
+#: ../ui/evolution.xml.h:30
+msgid "Show _Toolbar"
+msgstr "توکپټه _ښودل"
+
+#: ../ui/evolution.xml.h:31
+msgid "Show information about Evolution"
+msgstr "د اېوليوشن په اړه خبرتياوې ښودل"
+
+#: ../ui/evolution.xml.h:32
+msgid "Submit Bug Report"
+msgstr "کړاو راپور لېږل"
+
+#: ../ui/evolution.xml.h:33
+msgid "Submit _Bug Report"
+msgstr "کړاو _راپور لېږل"
+
+#: ../ui/evolution.xml.h:34
+msgid "Submit a bug report using Bug Buddy"
+msgstr "د کړاو ملګري په کارولو سره کړاو لېږل"
+
+#: ../ui/evolution.xml.h:35
+msgid "Toggle whether we are working offline."
+msgstr ""
+
+#: ../ui/evolution.xml.h:36
+msgid "Tool_bar Style"
+msgstr "د توک_پټې ډول"
+
+#: ../ui/evolution.xml.h:37
+msgid "View/Hide the Side Bar"
+msgstr "څنګ پټه ښودل/پټول"
+
+#: ../ui/evolution.xml.h:38
+msgid "View/Hide the Status Bar"
+msgstr "انکړ پټه ښودل/پټول"
+
+#: ../ui/evolution.xml.h:39
+msgid "_About"
+msgstr "په اړه_"
+
+#: ../ui/evolution.xml.h:40
+msgid "_Close Window"
+msgstr "کړکۍ بندول_"
+
+#: ../ui/evolution.xml.h:43
+msgid "_Forget Passwords"
+msgstr "تېرنويې هېرول_"
+
+#: ../ui/evolution.xml.h:44
+msgid "_Frequently Asked Questions"
+msgstr "بيابيا کېدونکې پوښتنې_"
+
+#: ../ui/evolution.xml.h:46
+msgid "_Hide Buttons"
+msgstr "تڼۍ پټول_"
+
+#: ../ui/evolution.xml.h:47
+msgid "_Icons Only"
+msgstr "يوازې انځورنونه_"
+
+#: ../ui/evolution.xml.h:49
+msgid "_Quick Reference"
+msgstr ""
+
+#: ../ui/evolution.xml.h:50
+msgid "_Quit"
+msgstr "وتل_"
+
+#: ../ui/evolution.xml.h:51
+msgid "_Switcher Appearance"
+msgstr "د ونجوونکي ښکارېدنه_"
+
+#: ../ui/evolution.xml.h:52
+msgid "_Synchronization Options..."
+msgstr ""
+
+#: ../ui/evolution.xml.h:53
+msgid "_Text Only"
+msgstr "يوازې ليکنه_"
+
+#: ../ui/evolution.xml.h:55
+msgid "_Window"
+msgstr "کړکۍ_"
+
+#: ../views/addressbook/galview.xml.h:1
+msgid "By _Company"
+msgstr "په _کمپنۍ"
+
+#: ../views/addressbook/galview.xml.h:2
+msgid "_Address Cards"
+msgstr "پته کارډونه_"
+
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "لړ ليد_"
+
+#: ../views/calendar/galview.xml.h:1
+msgid "W_eek View"
+msgstr "ا_ونۍ ليد"
+
+#: ../views/calendar/galview.xml.h:2
+msgid "_Day View"
+msgstr "ورځ ليد_"
+
+#: ../views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr "مياشت ليد_"
+
+#: ../views/calendar/galview.xml.h:5
+msgid "_Work Week View"
+msgstr "دنده اونۍ ليد_"
+
+#: ../views/mail/galview.xml.h:1
+msgid "As Sent Folder for Wi_de View"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:2
+msgid "As _Sent Folder"
+msgstr "لکه _لېږل شوي پوښۍ"
+
+#: ../views/mail/galview.xml.h:3
+msgid "By S_tatus"
+msgstr "په ا_نکړ"
+
+#: ../views/mail/galview.xml.h:4
+msgid "By Se_nder"
+msgstr "په لې_ږونکي"
+
+#: ../views/mail/galview.xml.h:5
+msgid "By Su_bject"
+msgstr "په سر_ليک"
+
+#: ../views/mail/galview.xml.h:6
+msgid "By _Follow Up Flag"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:7
+msgid "For _Wide View"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:8
+msgid "_Messages"
+msgstr "استوزې_"
+
+#: ../views/memos/galview.xml.h:1
+msgid "_Memos"
+msgstr "ميموګانې_"
+
+#: ../views/tasks/galview.xml.h:1
+msgid "With _Due Date"
+msgstr "د کولو _نېټې سره"
+
+#: ../views/tasks/galview.xml.h:2
+msgid "With _Status"
+msgstr "د _انکړ سره"
+
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+msgid "UTC"
+msgstr "‍‍UTC"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgid "<b>Time Zones</b>"
+msgstr "<b>مهال سيمې</b>"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "<b>_Selection</b>"
+msgstr "<b>ټاکنه_</b>"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid "Select a Time Zone"
+msgstr "يوه مهال سيمه وټاکئ"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+msgid "Timezone drop-down combination box"
+msgstr ""
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+
+#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-model.c:186
+msgid "Collection"
+msgstr "ټولګه"
+
+#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views.glade.h:4
+#, no-c-format
+msgid "Define Views for %s"
+msgstr "لپاره ليدنې پېژندل %s د"
+
+#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:368
+msgid "Define Views"
+msgstr "ليدنۍ پېژندل"
+
+#: ../widgets/menus/gal-define-views.glade.h:2
+#, no-c-format
+msgid "Define Views for \"%s\""
+msgstr "لپاره ليدنې پېژندل ‎\"%s\""
+
+#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/table/e-table-header-item.c:1922
+#: ../widgets/table/e-table-scrolled.c:216
+#: ../widgets/table/e-table-scrolled.c:217
+msgid "Table"
+msgstr "لښتيال"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
+msgid "Instance"
+msgstr "بېلګه"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+msgid "Save Current View"
+msgstr "اوسنی ليد ساتل"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "_Create new view"
+msgstr "نوی ليد جوړول_"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+msgid "_Replace existing view"
+msgstr "شته ليد ځاېناستول_"
+
+#. bonobo displays this string so it must be in locale
+#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-menus.c:354
+msgid "Custom View"
+msgstr "دوديز ليد"
+
+#: ../widgets/menus/gal-view-instance.c:583
+msgid "Save Custom View"
+msgstr "دوديز ليد ساتل"
+
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c:378
+msgid "Define Views..."
+msgstr "...ليدنې پېژندل"
+
+#: ../widgets/menus/gal-view-menus.c:291
+msgid "C_urrent View"
+msgstr "ا_وسنی ليد"
+
+#: ../widgets/menus/gal-view-menus.c:315
+#, c-format
+msgid "Select View: %s"
+msgstr "%s ‎:ليد ټاکل"
+
+#: ../widgets/menus/gal-view-menus.c:359
+msgid "Current view is a customized view"
+msgstr "اوسنی ليد يو دوديز ليد دی"
+
+#: ../widgets/menus/gal-view-menus.c:364
+msgid "Save Custom View..."
+msgstr "...دوديز ليد ساتل"
+
+#: ../widgets/menus/gal-view-menus.c:369
+msgid "Save current custom view"
+msgstr "اوسنی دوديز ليد ساتل"
+
+#: ../widgets/menus/gal-view-menus.c:383
+msgid "Create or edit views"
+msgstr "ليدنې جوړول يا سمول"
+
+#: ../widgets/menus/gal-view-new-dialog.c:70
+msgid "Factory"
+msgstr "فېکټرۍ"
+
+#: ../widgets/menus/gal-view-new-dialog.c:105
+msgid "Define New View"
+msgstr "نوی ليد پېژندل"
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+msgid "Name of new view:"
+msgstr ":د نوې ليد نوم"
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+msgid "Type of View"
+msgstr "د ليد ډول"
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+msgid "Type of view:"
+msgstr ":د ليد ډول"
+
+#: ../widgets/misc/e-attachment-bar.c:1137
+msgid "Attachment Bar"
+msgstr "نښلن پټه"
+
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "%s ‎:دوتنه نه شي نښلولی ‎%s"
+
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "نښلن ځانتياوې"
+
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr ":دوتنه نوم"
+
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr ":‌ډول MIME"
+
+#: ../widgets/misc/e-attachment.glade.h:5
+msgid "Suggest automatic display of attachment"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../widgets/misc/e-calendar-item.c:1273
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../widgets/misc/e-calendar.c:221
+msgid "Month Calendar"
+msgstr "مياشت کليز"
+
+#: ../widgets/misc/e-canvas-background.c:453
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
+msgid "Fill color"
+msgstr "ډکون رنګ"
+
+#: ../widgets/misc/e-canvas-background.c:460
+#: ../widgets/misc/e-canvas-background.c:461
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
+#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
+#: ../widgets/text/e-text.c:3659
+msgid "GDK fill color"
+msgstr "ډکون رنګ GDK"
+
+#: ../widgets/misc/e-canvas-background.c:474
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
+msgid "Fill stipple"
+msgstr ""
+
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482
+msgid "X1"
+msgstr "X۱"
+
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489
+msgid "X2"
+msgstr "X۲"
+
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
+msgid "Y1"
+msgstr "Y۱"
+
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
+msgid "Y2"
+msgstr "Y۲"
+
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
+msgid "Minimum width"
+msgstr "ټولولږه پلنوالی"
+
+#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
+msgid "Minimum Width"
+msgstr "ټولولږه پلنوالی"
+
+#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
+#: ../widgets/misc/e-expander.c:204
+msgid "Spacing"
+msgstr "تشونه"
+
+#: ../widgets/misc/e-cell-date-edit.c:291
+msgid "Now"
+msgstr "اوس"
+
+#: ../widgets/misc/e-cell-date-edit.c:848
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr ""
+
+#: ../widgets/misc/e-cell-percent.c:79
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:56
+msgid "Arabic"
+msgstr "عربي"
+
+#: ../widgets/misc/e-charset-picker.c:57
+msgid "Baltic"
+msgstr "بالټيک"
+
+#: ../widgets/misc/e-charset-picker.c:58
+msgid "Central European"
+msgstr "منځنی اروپايي"
+
+#: ../widgets/misc/e-charset-picker.c:59
+msgid "Chinese"
+msgstr "چينايي"
+
+#: ../widgets/misc/e-charset-picker.c:60
+msgid "Cyrillic"
+msgstr "سېرېلېک"
+
+#: ../widgets/misc/e-charset-picker.c:61
+msgid "Greek"
+msgstr "ګريک"
+
+#: ../widgets/misc/e-charset-picker.c:62
+msgid "Hebrew"
+msgstr "هېبرو"
+
+#: ../widgets/misc/e-charset-picker.c:63
+msgid "Japanese"
+msgstr "جاپاني"
+
+#: ../widgets/misc/e-charset-picker.c:64
+msgid "Korean"
+msgstr "کوريايي"
+
+#: ../widgets/misc/e-charset-picker.c:65
+msgid "Thai"
+msgstr "ټهايي"
+
+#: ../widgets/misc/e-charset-picker.c:66
+msgid "Turkish"
+msgstr "ترکي"
+
+#: ../widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr "يونيکوډ"
+
+#: ../widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr "لوېديځ اروپايي"
+
+#: ../widgets/misc/e-charset-picker.c:69
+msgid "Western European, New"
+msgstr "لوېديځ اروپايي، نوی"
+
+#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
+msgid "Traditional"
+msgstr "هڅوبي"
+
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
+msgid "Simplified"
+msgstr "ساده"
+
+#: ../widgets/misc/e-charset-picker.c:97
+msgid "Ukrainian"
+msgstr "اکرېني"
+
+#: ../widgets/misc/e-charset-picker.c:100
+msgid "Visual"
+msgstr "ښکارېدونکی"
+
+#: ../widgets/misc/e-charset-picker.c:169
+#, c-format
+msgid "Unknown character set: %s"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:214
+msgid "Character Encoding"
+msgstr "لوښه کوډييزونه"
+
+#: ../widgets/misc/e-charset-picker.c:229
+msgid "Enter the character set to use"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:336
+msgid "Other..."
+msgstr "...نور"
+
+#: ../widgets/misc/e-charset-picker.c:598
+msgid "Ch_aracter Encoding"
+msgstr "ل_وښه کوډييزونه"
+
+#: ../widgets/misc/e-dateedit.c:309
+msgid "Date and Time"
+msgstr "نېټه او مهال"
+
+#: ../widgets/misc/e-dateedit.c:330
+msgid "Text entry to input date"
+msgstr ""
+
+#: ../widgets/misc/e-dateedit.c:352
+msgid "Click this button to show a calendar"
+msgstr ""
+
+#: ../widgets/misc/e-dateedit.c:394
+msgid "Drop-down combination box to select time"
+msgstr ""
+
+#: ../widgets/misc/e-dateedit.c:470
+msgid "No_w"
+msgstr "او_س"
+
+#: ../widgets/misc/e-dateedit.c:476
+msgid "_Today"
+msgstr "نن_"
+
+#: ../widgets/misc/e-dateedit.c:1641
+msgid "Invalid Date Value"
+msgstr "ناسم نېټه ارزښت"
+
+#: ../widgets/misc/e-dateedit.c:1670
+msgid "Invalid Time Value"
+msgstr "ناسم مهال ارزښت"
+
+#: ../widgets/misc/e-expander.c:180
+msgid "Expanded"
+msgstr "غځېدلی"
+
+#: ../widgets/misc/e-expander.c:181
+msgid "Whether or not the expander is expanded"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:189
+msgid "Text of the expander's label"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:196
+msgid "Use underline"
+msgstr "لاندکرښه کارول"
+
+#: ../widgets/misc/e-expander.c:197
+msgid ""
+"If set, an underline in the text indicates the next character should be used "
+"for the mnemonic accelerator key"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:205
+msgid "Space to put between the label and the child"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:214
+msgid "Label widget"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:215
+msgid "A widget to display in place of the usual expander label"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
+msgid "Expander Size"
+msgstr "د غځوونکي کچ"
+
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
+msgid "Size of the expander arrow"
+msgstr "د غځوونکي غشي کچ"
+
+#: ../widgets/misc/e-expander.c:230
+msgid "Indicator Spacing"
+msgstr "نغوتاند تشونه"
+
+#: ../widgets/misc/e-expander.c:231
+msgid "Spacing around expander arrow"
+msgstr ""
+
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
+msgid "Advanced Search"
+msgstr "ژور پلټون"
+
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:234
+msgid "Save Search"
+msgstr "پلټون ساتل"
+
+#: ../widgets/misc/e-filter-bar.c:271
+msgid "_Searches"
+msgstr "پلټونونه_"
+
+#: ../widgets/misc/e-filter-bar.c:273
+msgid "Searches"
+msgstr "پلټونونه"
+
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+msgid "_Save Search..."
+msgstr "...پلټون ساتل_"
+
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+msgid "_Edit Saved Searches..."
+msgstr "...ساتل شوي پلټونونه سمول_"
+
+#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
+msgid "_Advanced Search..."
+msgstr "...ژور پلټون_"
+
+#: ../widgets/misc/e-filter-bar.h:104
+msgid "All Accounts"
+msgstr "ټول ګڼونونه"
+
+#: ../widgets/misc/e-filter-bar.h:105
+msgid "Current Account"
+msgstr "اوسنی ګڼون"
+
+#: ../widgets/misc/e-filter-bar.h:106
+msgid "Current Folder"
+msgstr "اوسنۍ پوښۍ"
+
+#: ../widgets/misc/e-filter-bar.h:107
+msgid "Current Message"
+msgstr "اوسنۍ استوزه"
+
+#: ../widgets/misc/e-image-chooser.c:167
+msgid "Choose Image"
+msgstr "انځور ټاکل"
+
+#: ../widgets/misc/e-map.c:625
+msgid "World Map"
+msgstr "د نړۍ نخچه"
+
+#: ../widgets/misc/e-map.c:627
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+
+#: ../widgets/misc/e-online-button.c:112
+#, fuzzy
+msgid "Online"
+msgstr "يو"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:103
+msgid "Sync with:"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:111
+msgid "Sync Private Records:"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:120
+msgid "Sync Categories:"
+msgstr ""
+
+#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+msgid "Empty message"
+msgstr "تشه استوزه"
+
+#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+msgid "Reflow model"
+msgstr ""
+
+#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+msgid "Column width"
+msgstr "د ستن پلنوالی"
+
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
+msgid "Search"
+msgstr "پلټون"
+
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
+msgid "Click here to change the search type"
+msgstr "د پلټون ډول بدلولو لپاره دلته کېکاږﺉ"
+
+#: ../widgets/misc/e-search-bar.c:607
+msgid "_Search"
+msgstr "پلټون_"
+
+#: ../widgets/misc/e-search-bar.c:613
+msgid "_Find Now"
+msgstr "اوس لټول_"
+
+#: ../widgets/misc/e-search-bar.c:614
+msgid "_Clear"
+msgstr "پاکول_"
+
+#: ../widgets/misc/e-search-bar.c:869
+msgid "Item ID"
+msgstr "توکی پېژند"
+
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
+msgid "Text"
+msgstr "ليکنه"
+
+#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
+#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
+#: ../widgets/misc/e-search-bar.c:1007
+msgid "Sho_w: "
+msgstr ":ښود_ل"
+
+#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
+#. the term to search for
+#: ../widgets/misc/e-search-bar.c:1024
+msgid "Sear_ch: "
+msgstr ":پلټو_ن"
+
+#. To Translators: The " in " label is part of the Quick Search Bar, example:
+#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
+#: ../widgets/misc/e-search-bar.c:1036
+msgid " i_n "
+msgstr "پ_ه"
+
+#: ../widgets/misc/e-selection-model-array.c:594
+#: ../widgets/table/e-tree-selection-model.c:807
+msgid "Cursor Row"
+msgstr "ځری کيل"
+
+#: ../widgets/misc/e-selection-model-array.c:601
+#: ../widgets/table/e-tree-selection-model.c:814
+msgid "Cursor Column"
+msgstr "ځری ستن"
+
+#: ../widgets/misc/e-selection-model.c:210
+msgid "Sorter"
+msgstr "اڼوکی"
+
+#: ../widgets/misc/e-selection-model.c:217
+msgid "Selection Mode"
+msgstr "ټاکنې اکر"
+
+#: ../widgets/misc/e-selection-model.c:225
+msgid "Cursor Mode"
+msgstr "ځری اکر"
+
+#: ../widgets/misc/e-send-options.c:518
+msgid "When de_leted:"
+msgstr ":کله چې وړ_نګول شي"
+
+#: ../widgets/misc/e-send-options.glade.h:1
+msgid "<b>Delivery Options</b>"
+msgstr "<b>د لېږلو غوراوي</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:2
+msgid "<b>Replies</b>"
+msgstr "<b>ځوابونه</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:3
+msgid "<b>Return Notification</b>"
+msgstr "<b>راستنېدا يادښت</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:4
+msgid "<b>Status Tracking</b>"
+msgstr "<b>انکړ پلنيونه</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:5
+msgid "A_uto-delete sent item"
+msgstr "لېږل شوی توکی خپل-ړنګول"
+
+#: ../widgets/misc/e-send-options.glade.h:7
+msgid "Creat_e a sent item to track information"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:8
+msgid "Deli_vered and opened"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:9
+msgid "Gene_ral Options"
+msgstr "ټول_ګړي غوراوي"
+
+#: ../widgets/misc/e-send-options.glade.h:10
+msgid ""
+"None\n"
+"Mail Receipt"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:12
+msgid ""
+"Normal\n"
+"Proprietary\n"
+"Confidential\n"
+"Secret\n"
+"Top Secret\n"
+"For Your Eyes Only"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:18
+msgid "R_eply requested"
+msgstr "ځ_واب غوښتل شوی"
+
+#: ../widgets/misc/e-send-options.glade.h:20
+msgid "Sta_tus Tracking"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:21
+msgid ""
+"Undefined\n"
+"High\n"
+"Standard\n"
+"Low"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:25
+msgid "When acce_pted:"
+msgstr ":کله چې وم_نل شي"
+
+#: ../widgets/misc/e-send-options.glade.h:26
+msgid "When co_mpleted:"
+msgstr ":کله چې ب_شپړ شي"
+
+#: ../widgets/misc/e-send-options.glade.h:27
+msgid "When decli_ned:"
+msgstr ":کله چې ون_ه منل شي"
+
+#: ../widgets/misc/e-send-options.glade.h:28
+msgid "Wi_thin"
+msgstr "پ_ه"
+
+#: ../widgets/misc/e-send-options.glade.h:29
+msgid "_After:"
+msgstr ":وروسته_"
+
+#: ../widgets/misc/e-send-options.glade.h:30
+msgid "_All information"
+msgstr "ټولې خبرتياوې_"
+
+#. To translators: This means Delay the message delivery for some time
+#: ../widgets/misc/e-send-options.glade.h:32
+msgid "_Delay message delivery"
+msgstr "د استوزې لېږنه ځنډول_"
+
+#: ../widgets/misc/e-send-options.glade.h:33
+msgid "_Delivered"
+msgstr "لېږل شوي_"
+
+#: ../widgets/misc/e-send-options.glade.h:35
+msgid "_Set expiration date"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:36
+msgid "_Until:"
+msgstr ":تر_"
+
+#: ../widgets/misc/e-send-options.glade.h:37
+msgid "_When convenient"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:38
+msgid "_When opened:"
+msgstr ":کله چې پرانيستل شي_"
+
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
+#: ../widgets/misc/e-task-widget.c:278
+#, c-format
+msgid "%s (...)"
+msgstr "(...) %s"
+
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
+#. %d is a number between 0 and 100, describing the percentage of operation complete
+#: ../widgets/misc/e-task-widget.c:284
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr ""
+
+#: ../widgets/misc/e-url-entry.c:107
+msgid "Click here to go to URL"
+msgstr "ته د تلو لپاره دلته کېکاږﺉ ‎URL"
+
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "Edit Master Category List..."
+msgstr ""
+
+#: ../widgets/misc/gal-categories.glade.h:2
+msgid "Item(s) belong to these _categories:"
+msgstr ""
+
+#: ../widgets/misc/gal-categories.glade.h:3
+msgid "_Available Categories:"
+msgstr ":شته ټولۍ_"
+
+#: ../widgets/misc/gal-categories.glade.h:4
+msgid "categories"
+msgstr "ټولۍ"
+
+#: ../widgets/table/e-cell-combo.c:169
+msgid "popup list"
+msgstr "بړبوکيز لړ"
+
+#: ../widgets/table/e-cell-date.c:62
+msgid "%l:%M %p"
+msgstr "%l:%M %p"
+
+#: ../widgets/table/e-cell-pixbuf.c:360
+msgid "Selected Column"
+msgstr "ټاکل شوې ستن"
+
+#: ../widgets/table/e-cell-pixbuf.c:367
+msgid "Focused Column"
+msgstr "منځواله ستن"
+
+#: ../widgets/table/e-cell-pixbuf.c:374
+msgid "Unselected Column"
+msgstr "ناټاکل شوې ستن"
+
+#: ../widgets/table/e-cell-text.c:1808
+msgid "Strikeout Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-text.c:1815
+msgid "Underline Column"
+msgstr "لاندکرښه ستن"
+
+#: ../widgets/table/e-cell-text.c:1822
+msgid "Bold Column"
+msgstr "ډبل ستن"
+
+#: ../widgets/table/e-cell-text.c:1829
+msgid "Color Column"
+msgstr "رنګه ستن"
+
+#: ../widgets/table/e-cell-text.c:1843
+msgid "BG Color Column"
+msgstr "د شاليد رنګ ستن"
+
+#: ../widgets/table/e-table-config.c:152
+msgid "State"
+msgstr "دريځ"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Ascending)"
+msgstr ""
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Descending)"
+msgstr ""
+
+#: ../widgets/table/e-table-config.c:392
+msgid "Not sorted"
+msgstr "نا اڼل شوی"
+
+#: ../widgets/table/e-table-config.c:433
+msgid "No grouping"
+msgstr "هېڅ ډلونه"
+
+#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.glade.h:11
+msgid "Show Fields"
+msgstr "ډګرونه ښودل"
+
+#: ../widgets/table/e-table-config.c:664
+msgid "Available Fields"
+msgstr "شته ډګرونه"
+
+#: ../widgets/table/e-table-config.glade.h:1
+msgid "A_vailable Fields:"
+msgstr ":ش_ته ډګرونه"
+
+#: ../widgets/table/e-table-config.glade.h:2
+#: ../widgets/table/e-table-header-item.c:1583
+msgid "Ascending"
+msgstr ""
+
+#: ../widgets/table/e-table-config.glade.h:3
+msgid "Clear All"
+msgstr "ټول پاکول"
+
+#: ../widgets/table/e-table-config.glade.h:4
+msgid "Clear _All"
+msgstr "ټول _پاکول"
+
+#: ../widgets/table/e-table-config.glade.h:5
+#: ../widgets/table/e-table-header-item.c:1583
+msgid "Descending"
+msgstr ""
+
+#: ../widgets/table/e-table-config.glade.h:8
+msgid "Group Items By"
+msgstr "توکي ډلول په"
+
+#: ../widgets/table/e-table-config.glade.h:9
+msgid "Move _Down"
+msgstr "ښکته _خوځول"
+
+#: ../widgets/table/e-table-config.glade.h:10
+msgid "Move _Up"
+msgstr "بره _خوځول"
+
+#: ../widgets/table/e-table-config.glade.h:12
+msgid "Show _field in View"
+msgstr "ډګر په _ليد کې ښودل"
+
+#: ../widgets/table/e-table-config.glade.h:13
+msgid "Show field i_n View"
+msgstr "ډګر پ_ه ليد کې ښودل"
+
+#: ../widgets/table/e-table-config.glade.h:14
+msgid "Show field in _View"
+msgstr "ډګر په لي_د کې ښودل"
+
+#: ../widgets/table/e-table-config.glade.h:15
+msgid "Sort"
+msgstr "اڼل"
+
+#: ../widgets/table/e-table-config.glade.h:16
+msgid "Sort Items By"
+msgstr "توکي اڼل په"
+
+#: ../widgets/table/e-table-config.glade.h:17
+msgid "Then By"
+msgstr "بيا په"
+
+#: ../widgets/table/e-table-config.glade.h:19
+msgid "_Fields Shown..."
+msgstr "...ښکارېدلي ډګرونه_"
+
+#: ../widgets/table/e-table-config.glade.h:20
+msgid "_Group By..."
+msgstr "...ډلول په_"
+
+#: ../widgets/table/e-table-config.glade.h:22
+msgid "_Show field in View"
+msgstr "ډګر په ليد کې ښودل_"
+
+#: ../widgets/table/e-table-config.glade.h:23
+msgid "_Show these fields in order:"
+msgstr ":دا ډګرونه په اوډون ښودل_"
+
+#: ../widgets/table/e-table-config.glade.h:24
+msgid "_Sort..."
+msgstr "...اڼل_"
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:67
+#: ../widgets/table/e-table-field-chooser-item.c:634
+#: ../widgets/table/e-table-field-chooser.c:67
+#: ../widgets/table/e-table-header-item.c:1887
+msgid "DnD code"
+msgstr "کوډ ‎DnD"
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:74
+#: ../widgets/table/e-table-field-chooser-item.c:641
+#: ../widgets/table/e-table-field-chooser.c:74
+#: ../widgets/table/e-table-header-item.c:1901
+msgid "Full Header"
+msgstr "بشپړ سريز"
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:116
+msgid "Add a column..."
+msgstr "...ستن زياتول"
+
+#: ../widgets/table/e-table-field-chooser.glade.h:1
+msgid "Field Chooser"
+msgstr "ډګر ټاکونکی"
+
+#: ../widgets/table/e-table-field-chooser.glade.h:2
+msgid ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:345
+#, c-format
+msgid "%s : %s (%d item)"
+msgid_plural "%s : %s (%d items)"
+msgstr[0] "‎%s : %s (‎توکی %d)"
+msgstr[1] "‎%s : %s (‎توکي %d)"
+
+#: ../widgets/table/e-table-group-container.c:351
+#, c-format
+msgid "%s (%d item)"
+msgid_plural "%s (%d items)"
+msgstr[0] "‎%s (‎توکی %d)"
+msgstr[1] "‎%s (‎توکي %d)"
+
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
+msgid "Alternating Row Colors"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
+msgid "Horizontal Draw Grid"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+msgid "Vertical Draw Grid"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
+msgid "Draw focus"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
+msgid "Cursor mode"
+msgstr "ځری اکر"
+
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+msgid "Selection model"
+msgstr "د ټاکنې بېلګه"
+
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-tree.c:3317
+msgid "Length Threshold"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-tree.c:3349
+msgid "Uniform row height"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
+msgid "Frozen"
+msgstr "کنګل شوی"
+
+#: ../widgets/table/e-table-header-item.c:1453
+msgid "Customize Current View"
+msgstr "اوسنی ليد دوديزول"
+
+#: ../widgets/table/e-table-header-item.c:1473
+msgid "Sort _Ascending"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1474
+msgid "Sort _Descending"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1475
+msgid "_Unsort"
+msgstr "نااڼل_"
+
+#: ../widgets/table/e-table-header-item.c:1477
+msgid "Group By This _Field"
+msgstr "په دې _ډګر ډلول"
+
+#: ../widgets/table/e-table-header-item.c:1478
+msgid "Group By _Box"
+msgstr "په _بکس ډلول"
+
+#: ../widgets/table/e-table-header-item.c:1480
+msgid "Remove This _Column"
+msgstr "دا _ستن ړنګول"
+
+#: ../widgets/table/e-table-header-item.c:1481
+msgid "Add a C_olumn..."
+msgstr "...س_تن زياتول"
+
+#: ../widgets/table/e-table-header-item.c:1483
+msgid "A_lignment"
+msgstr "پ_رليکتيا"
+
+#: ../widgets/table/e-table-header-item.c:1484
+msgid "B_est Fit"
+msgstr "ښ_ه برابرول"
+
+#: ../widgets/table/e-table-header-item.c:1485
+msgid "Format Column_s..."
+msgstr "...ستن_ې بڼول"
+
+#: ../widgets/table/e-table-header-item.c:1487
+msgid "Custo_mize Current View..."
+msgstr "...اوسنی ليد دود_يزول"
+
+#: ../widgets/table/e-table-header-item.c:1543
+msgid "_Sort By"
+msgstr "اڼل په_"
+
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1561
+msgid "_Custom"
+msgstr "دوديز_"
+
+#: ../widgets/table/e-table-header-item.c:1894
+msgid "Font Description"
+msgstr "د ليکبڼې سپړاوی"
+
+#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-sorter.c:173
+msgid "Sort Info"
+msgstr "خبرتياوې اڼل"
+
+#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "ونه"
+
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+msgid "Table header"
+msgstr "لښتيال سرۍ"
+
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+msgid "Table model"
+msgstr "د لښتيال بېلګه"
+
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+msgid "Cursor row"
+msgstr "ځری کيل"
+
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-tree.c:3356
+msgid "Always search"
+msgstr "تل پلټل"
+
+#: ../widgets/table/e-table.c:3346
+msgid "Use click to add"
+msgstr "د زياتولو لپاره کېکاږﺉ"
+
+#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
+msgid "ETree table adapter"
+msgstr ""
+
+#: ../widgets/table/e-tree.c:3362
+msgid "Retro Look"
+msgstr ""
+
+#: ../widgets/table/e-tree.c:3363
+msgid "Draw lines and +/- expanders."
+msgstr ""
+
+#: ../widgets/text/e-text.c:2735
+msgid "Input Methods"
+msgstr "د ننوتۍ لېلې"
+
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+msgid "Event Processor"
+msgstr "پېښه بهيرګر"
+
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
+msgid "Bold"
+msgstr "ډبل"
+
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
+msgid "Strikeout"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+msgid "Anchor"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+msgid "Justification"
+msgstr "همجوليزتيا"
+
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
+msgid "Clip Width"
+msgstr "د ټوټې پلنوالی"
+
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
+msgid "Clip Height"
+msgstr "د ټوټې اوږدوالی"
+
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
+msgid "Clip"
+msgstr "ټوټه"
+
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
+msgid "Fill clip rectangle"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
+msgid "X Offset"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
+msgid "Y Offset"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
+msgid "Text width"
+msgstr "د ليکنې پلنوالی"
+
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
+msgid "Text height"
+msgstr "د ليکنې اوږدوالی"
+
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+msgid "Use ellipsis"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+msgid "Ellipsis"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+msgid "Line wrap"
+msgstr "ليکې نغاړل"
+
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
+msgid "Break characters"
+msgstr "مات لوښې"
+
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+msgid "Max lines"
+msgstr "ټولوجګه ليکې"
+
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+msgid "Draw borders"
+msgstr "بريدونه انځورول"
+
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+msgid "Allow newlines"
+msgstr "نوېليکې پرېښل"
+
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+msgid "Draw background"
+msgstr "شاليد انځورول"
+
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
+msgid "Draw button"
+msgstr "تڼۍ انځورول"
+
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
+msgid "Cursor position"
+msgstr "د ځري ځای"
+
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
+msgid "IM Context"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+msgid "Handle Popup"
+msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2c4c1e4035..ac83a441b7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,6 +8,7 @@
 # Rodrigo Flores <rodrigomarquesflores@gmail.com>, 2007.
 # Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>, 2008.
 # Vladimir Melo <vladimirmelo.psi@gmail.com>, 2008
+# Fabrício Godoy <skarllot@gmail.com>, 2008
 #
 #: ../shell/main.c:694
 msgid ""
@@ -15,8 +16,8 @@ msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-06-29 19:52+0000\n"
-"PO-Revision-Date: 2008-06-29 17:15-0300\n"
-"Last-Translator: Vladimir Melo <vladimirmelo.psi@gmail.com>\n"
+"PO-Revision-Date: 2008-07-22 02:46-0300\n"
+"Last-Translator: Fabrício Godoy <skarllot@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -454,7 +455,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:22
 msgid "The Evolution addressbook has quit unexpectedly."
-msgstr "O catálogo de endereços do Evolution terminou de forma inesperada."
+msgstr "O catálogo de endereços do Evolution saiu inesperadamente."
 
 #: ../addressbook/addressbook.error.xml.h:23
 msgid ""
@@ -592,11 +593,11 @@ msgstr "Não foi possível carregar o catálogo de endereços"
 #: ../addressbook/conduit/address-conduit.c:1397
 #: ../addressbook/conduit/address-conduit.c:1400
 msgid "Could not read pilot's Address application block"
-msgstr "Não foi possível ler os dados do aplicativo de endereços do Palm"
+msgstr "Não foi possível ler os dados do aplicativo de endereços do PDA"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
-msgstr "Completar Automaticamente"
+msgstr "Completar automaticamente"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
@@ -1162,7 +1163,7 @@ msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
-"Este é o número máximo de entradas a serem baixadas. Atribuir um valor muito "
+"Este é o número máximo de entradas a serem baixadas. Definir um valor muito "
 "grande a este número diminuirá a velocidade de seu catálogo de endereços."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
@@ -1416,7 +1417,7 @@ msgstr "A_rquivar em:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Free/Busy:"
-msgstr "_Livre/Ocupado:"
+msgstr "Disponibi_lidade:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home Page:"
@@ -3405,7 +3406,7 @@ msgstr "Agenda"
 #: ../calendar/gui/dialogs/event-editor.c:369
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
-msgstr "Livre/Ocupado"
+msgstr "Disponibilidade"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:638
 #: ../addressbook/gui/widgets/eab-contact-display.c:653
@@ -3628,7 +3629,7 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid "This query did not complete successfully."
-msgstr "Esta consulta não terminou com sucesso."
+msgstr "Esta consulta não foi concluída com sucesso."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error adding list"
@@ -4361,15 +4362,15 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:47
 msgid "The Evolution calendar has quit unexpectedly."
-msgstr "A agenda do Evolution terminou inesperadamente."
+msgstr "A agenda do Evolution saiu inesperadamente."
 
 #: ../calendar/calendar.error.xml.h:48
 msgid "The Evolution memo has quit unexpectedly."
-msgstr "O memorando do Evolution terminou inesperadamente."
+msgstr "O memorando do Evolution saiu inesperadamente."
 
 #: ../calendar/calendar.error.xml.h:49
 msgid "The Evolution tasks have quit unexpectedly."
-msgstr "As tarefas do Evolution terminaram inesperadamente."
+msgstr "As tarefas do Evolution sairam inesperadamente."
 
 #: ../calendar/calendar.error.xml.h:50
 msgid "The calendar is not marked for offline usage."
@@ -4512,17 +4513,17 @@ msgstr "Não foi possível iniciar o evolution-data-server"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1627
 #: ../calendar/conduits/calendar/calendar-conduit.c:1630
 msgid "Could not read pilot's Calendar application block"
-msgstr "Não foi possível ler os dados do aplicativo de Agenda do palm"
+msgstr "Não foi possível ler os dados do aplicativo de Agenda do PDA"
 
 #: ../calendar/conduits/memo/memo-conduit.c:912
 #: ../calendar/conduits/memo/memo-conduit.c:915
 msgid "Could not read pilot's Memo application block"
-msgstr "Não foi possível ler os dados do aplicativo de memorandos do palm"
+msgstr "Não foi possível ler os dados do aplicativo de memorandos do PDA"
 
 #: ../calendar/conduits/memo/memo-conduit.c:959
 #: ../calendar/conduits/memo/memo-conduit.c:962
 msgid "Could not write pilot's Memo application block"
-msgstr "Não foi possível ler os dados do aplicativo de memorandos do palm"
+msgstr "Não foi possível gravar os dados do aplicativo de memorandos do PDA"
 
 #: ../calendar/conduits/todo/todo-conduit.c:238
 msgid "Default Priority:"
@@ -4531,12 +4532,12 @@ msgstr "Prioridade Padrão:"
 #: ../calendar/conduits/todo/todo-conduit.c:1100
 #: ../calendar/conduits/todo/todo-conduit.c:1103
 msgid "Could not read pilot's ToDo application block"
-msgstr "Não foi possível ler os dados do aplicativo de tarefas do palm"
+msgstr "Não foi possível ler os dados do aplicativo de tarefas do PDA"
 
 #: ../calendar/conduits/todo/todo-conduit.c:1145
 #: ../calendar/conduits/todo/todo-conduit.c:1148
 msgid "Could not write pilot's ToDo application block"
-msgstr "Não foi possível escrever os dados do aplicativo de tarefas do palm"
+msgstr "Não foi possível gravar os dados do aplicativo de tarefas do PDA"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 #: ../plugins/itip-formatter/itip-formatter.c:2354
@@ -4858,11 +4859,11 @@ msgstr "Transparência do Evento"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Free/busy server URLs"
-msgstr "URLs de servidor de livre/ocupado"
+msgstr "URLs de servidor de disponibilidade"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy template URL"
-msgstr "Modelo de URL livre/ocupado"
+msgstr "Modelo de URL de disponibilidade"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Gradient of the events in calendar views."
@@ -4902,7 +4903,7 @@ msgstr "Hora do último alarme"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "List of server URLs for free/busy publishing."
-msgstr "Lista de URLs de servidores para a publicação de livre/ocupado."
+msgstr "Lista de URLs de servidores para a publicação de disponibilidade."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Marcus Bains Line"
@@ -5060,9 +5061,9 @@ msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
-"O modelo de URL a se usar como padrão para dados de livre/ocupado, %u é "
-"substituído pela parte usuário do endereço de e-mail e %d é substituído pelo "
-"domínio."
+"O modelo de URL a se usar como padrão para dados de disponibilidade, %u é "
+"substituído pela parte referente ao usuário do endereço de e-mail e %d é "
+"substituído pelo domínio."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid ""
@@ -5611,7 +5612,7 @@ msgstr "<span weight=\"bold\">Alertas</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">Servidor Livre/Ocupado Padrão</span>"
+msgstr "<span weight=\"bold\">Servidor Padrão de Disponibilidade</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #: ../mail/mail-config.glade.h:17
@@ -7123,7 +7124,7 @@ msgstr "Clique para adicionar uma tarefa"
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
-msgstr "% Concluída"
+msgstr "% Concluído"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
@@ -7592,33 +7593,33 @@ msgstr "Mensagem de Tarefa Inválida"
 #: ../calendar/gui/e-itip-control.c:1515
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> publicou informação de livre/ocupado."
+msgstr "<b>%s</b> publicou informações de disponibilidade."
 
 #: ../calendar/gui/e-itip-control.c:1516
 msgid "Free/Busy Information"
-msgstr "Informação de livre/ocupado"
+msgstr "Informação de disponibilidade"
 
 #: ../calendar/gui/e-itip-control.c:1520
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> requisita sua informação de livre/ocupado."
+msgstr "<b>%s</b> está requisitando sua informação de disponibilidade."
 
 #: ../calendar/gui/e-itip-control.c:1521
 msgid "Free/Busy Request"
-msgstr "Pedido de Livre/Ocupado"
+msgstr "Pedido de Disponibilidade"
 
 #: ../calendar/gui/e-itip-control.c:1525
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> respondeu a um pedido de livre/ocupado."
+msgstr "<b>%s</b> respondeu a um pedido de disponibilidade."
 
 #: ../calendar/gui/e-itip-control.c:1526
 msgid "Free/Busy Reply"
-msgstr "Resposta de Livre/Ocupado"
+msgstr "Resposta de Disponibilidade"
 
 #: ../calendar/gui/e-itip-control.c:1531
 msgid "Bad Free/Busy Message"
-msgstr "Mensagem de Livre/Ocupado Inválida"
+msgstr "Mensagem de Disponibilidade Inválida"
 
 #: ../calendar/gui/e-itip-control.c:1607
 msgid "The message does not appear to be properly formed"
@@ -7696,7 +7697,7 @@ msgstr "Recusar"
 
 #: ../calendar/gui/e-itip-control.c:2388
 msgid "Send Free/Busy Information"
-msgstr "Enviar Informação de Livre/Ocupado"
+msgstr "Enviar Informação de Disponibilidade"
 
 #: ../calendar/gui/e-itip-control.c:2416
 msgid "Update respondent status"
@@ -7885,7 +7886,7 @@ msgstr "Mostrar com _menos ampliação"
 
 #: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_Update free/busy"
-msgstr "_Atualizar livre/ocupado"
+msgstr "_Atualizar disponibilidade"
 
 #: ../calendar/gui/e-meeting-time-sel.c:508
 msgid "_<<"
@@ -8130,7 +8131,7 @@ msgstr "Informação do memorando"
 
 #: ../calendar/gui/itip-utils.c:662 ../calendar/gui/itip-utils.c:801
 msgid "Free/Busy information"
-msgstr "Informação de Livre/Ocupado"
+msgstr "Informação de disponibilidade"
 
 #: ../calendar/gui/itip-utils.c:664
 msgid "Calendar information"
@@ -8151,7 +8152,7 @@ msgstr "Contraproposta"
 #: ../calendar/gui/itip-utils.c:797
 #, c-format
 msgid "Free/Busy information (%s to %s)"
-msgstr "Informação de livre/ocupado (%s para %s)"
+msgstr "Informação de disponibilidade (%s para %s)"
 
 #: ../calendar/gui/itip-utils.c:807
 msgid "iCalendar information"
@@ -10359,7 +10360,7 @@ msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
-"O Evolution terminou de forma inesperada enquanto você redigia uma nova "
+"O Evolution saiu de forma inesperada enquanto você redigia uma nova "
 "mensagem. Recuperar a mensagem permitirá que você continue de onde você "
 "parou."
 
@@ -12497,10 +12498,10 @@ msgid ""
 "can be slow, if remote addressbooks (like ldap) are marked for "
 "autocompletion."
 msgstr ""
-"Procurar no catálogo de endereços o e-mail do remetente. Se encontrado não "
-"será classificado como SPAM. Procurar nos livros marcados para completar "
+"Procurar no catálogo de endereços o e-mail do remetente. Se encontrado, não "
+"será classificado como spam. Procurar nos catálogos marcados para completar "
 "automaticamente. Se estiverem marcados catálogos de endereços remotos (como "
-"ldap), poderá ser demorado para completar automaticamente."
+"LDAP), poderá ser demorado para completar automaticamente."
 
 #: ../mail/evolution-mail.schemas.in.h:29
 msgid "Determines whether to use custom headers to check for junk"
@@ -12538,7 +12539,7 @@ msgstr "Exibir indicadores de erros ortográficos enquanto você digita."
 
 #: ../mail/evolution-mail.schemas.in.h:35
 msgid "Empty Junk folders on exit"
-msgstr "Esvaziar pastas Spam ao sair"
+msgstr "Esvaziar pastas de Spam ao sair"
 
 #: ../mail/evolution-mail.schemas.in.h:36
 msgid "Empty Trash folders on exit"
@@ -12546,7 +12547,7 @@ msgstr "Esvaziar pastas Lixeira ao sair"
 
 #: ../mail/evolution-mail.schemas.in.h:37
 msgid "Empty all Junk folders when exiting Evolution."
-msgstr "Esvaziar todas as pastas Spam ao sair do Evolution."
+msgstr "Esvaziar todas as pastas de Spam ao sair do Evolution."
 
 #: ../mail/evolution-mail.schemas.in.h:38
 msgid "Empty all Trash folders when exiting Evolution."
@@ -12791,7 +12792,7 @@ msgstr "Tempo mínimo em dias para esvaziar o spam ao sair."
 
 #: ../mail/evolution-mail.schemas.in.h:84
 msgid "Minimum time between emptying the trash on exit, in days."
-msgstr "Intervalo mínimo para esvaziar a lixeira ao sair, em dias."
+msgstr "Tempo mínimo em dias para esvaziar a lixeira ao sair."
 
 #: ../mail/evolution-mail.schemas.in.h:85
 msgid "Number of addresses to display in TO/CC/BCC"
@@ -13387,7 +13388,7 @@ msgstr " V_erificar Tipos com Suporte "
 
 #: ../mail/mail-config.glade.h:2
 msgid "(Note: Requires restart of the application)"
-msgstr "(Nota: É necessário reiniciar a aplicação)"
+msgstr "(Nota: É necessário reiniciar o aplicativo)"
 
 #: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
@@ -13608,7 +13609,7 @@ msgstr ""
 "Agora você está pronto para enviar e receber e-mails \n"
 "utilizando o Evolution. \n"
 "\n"
-"Pressione \"Aplicar\" para salvar suas configurações."
+"Clique em \"Aplicar\" para salvar suas configurações."
 
 #: ../mail/mail-config.glade.h:65
 msgid "De_fault"
@@ -13620,7 +13621,7 @@ msgstr "Co_dificação de caracteres padrão:"
 
 #: ../mail/mail-config.glade.h:68
 msgid "Delete junk messages on e_xit"
-msgstr "E_xcluir spam ao sair"
+msgstr "Remover mensagens marcadas como spam ao sair"
 
 #: ../mail/mail-config.glade.h:70
 msgid "Digitally sign o_utgoing messages (by default)"
@@ -14453,10 +14454,10 @@ msgid ""
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 msgstr ""
-"A pasta não vazia em &quot;{1}&quot; já existe.\n"
+"Uma pasta não vazia em &quot;{1}&quot; já existe.\n"
 "\n"
-"Você pode escolher entre ignorar esta pasta, sobrescrevê-la, adicionar o seu "
-"conteúdo ou sair."
+"Você pode escolher entre ignorar esta pasta, acrescentar o seu conteúdo, "
+"sobrescrevê-la ou sair."
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
@@ -14752,7 +14753,7 @@ msgid ""
 "again."
 msgstr ""
 "Se você sair, estas mensagens não serão enviadas até que o Evolution seja "
-"reiniciado."
+"iniciado novamente."
 
 #: ../mail/mail.error.xml.h:68
 msgid "Ignore"
@@ -15336,12 +15337,13 @@ msgid ""
 "It also restores all your personal settings, mail filters etc."
 msgstr ""
 "Você pode restaurar o Evolution a partir do backup. Você pode restaurar "
-"todas Mensagens, Agendas, Tarefas, Memorandos, e Catálogos de Endereços.\n"
-"Também serão restauradas suas configurações pessoais, filtros de e-mail etc."
+"todas as Mensagens, Agendas, Tarefas, Memorandos, e Catálogos de Endereços.\n"
+"Também serão restauradas suas configurações pessoais, filtros de e-mail e "
+"etc."
 
 #: ../plugins/backup-restore/backup-restore.c:244
 msgid "_Restore Evolution from the backup file"
-msgstr "_Restaurar Evolution a partir do arquivo de backup"
+msgstr "_Restaurar o Evolution a partir do arquivo de backup"
 
 #: ../plugins/backup-restore/backup-restore.c:251
 msgid "Please select an Evolution Archive to restore:"
@@ -15361,7 +15363,7 @@ msgstr "Restaurar diretório do Evolution"
 
 #: ../plugins/backup-restore/backup.c:44
 msgid "Check Evolution Backup"
-msgstr "Checar Backup do Evolution"
+msgstr "Verificar o Backup do Evolution"
 
 #: ../plugins/backup-restore/backup.c:46
 msgid "Restart Evolution"
@@ -15388,7 +15390,7 @@ msgstr ""
 
 #: ../plugins/backup-restore/backup.c:88
 msgid "Backup complete"
-msgstr "Backup Completo"
+msgstr "Backup concluído"
 
 #: ../plugins/backup-restore/backup.c:93
 #: ../plugins/backup-restore/backup.c:136
@@ -15409,7 +15411,7 @@ msgstr "Carregando configurações do Evolution"
 
 #: ../plugins/backup-restore/backup.c:129
 msgid "Removing temporary backup files"
-msgstr "removendo arquivos temporários de backup"
+msgstr "Removendo arquivos temporários de backup"
 
 #: ../plugins/backup-restore/backup.c:249
 #, c-format
@@ -15457,10 +15459,10 @@ msgid ""
 "you want Evolution to restart automatically after backup, please enable the "
 "toggle button."
 msgstr ""
-"Backup do Evolution somente pode começar quando o Evolution não está "
-"executando. Por favor esteja certo que você salvou e fechou todas as janelas "
-"não salvas antes de prosseguir. Se você quiser o Evolution pode reiniciar "
-"automaticamente após fazer o backup, por favor habilite o botão de "
+"Backup do Evolution somente pode começar quando o Evolution não está sendo "
+"executado. Por favor, esteja certo de que você salvou e fechou todas as "
+"janelas não salvas antes de prosseguir. Se você quiser, o Evolution pode "
+"reiniciar automaticamente após fazer o backup, por favor habilite o botão de "
 "alternância."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
@@ -15483,12 +15485,12 @@ msgstr ""
 "los a partir do backup. A Restauração do Evolution só poderá ser iniciada "
 "quando o Evolution não estiver em execução. Por favor, certifique-se de "
 "fechar todas as janela não salvas antes de prosseguir. Se você deseja que o "
-"Evolution reinicie automaticamente após a restaurações, por favor habilite "
-"o  botão de alternância."
+"Evolution reinicie automaticamente após a restauração, por favor habilite o "
+"botão de alternância."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
-msgstr "Fazer backup e restaurar configurações e dados do Evolution"
+msgstr "Fazer backup e restauração das configurações e dados do Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "R_estore Settings..."
@@ -17356,7 +17358,7 @@ msgid ""
 "tasks or free/busy information"
 msgstr ""
 "A mensagem contém uma agenda, mas a agenda não contém eventos, tarefas ou "
-"informação de livre/ocupado"
+"informação de disponibilidade"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "The calendar attached contains multiple items"
@@ -18539,7 +18541,7 @@ msgid ""
 "Free/Busy"
 msgstr ""
 "iCal\n"
-"Livre/Ocupado"
+"Disponibilidade"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
@@ -18756,7 +18758,7 @@ msgstr ""
 "ao Evolution conectar-se às suas contas de e-mail e importar\n"
 "arquivos de outros aplicativos. \n"
 "\n"
-"Por favor, clique o botão \"Avançar\" para continuar. "
+"Por favor, clique no botão \"Avançar\" para continuar. "
 
 #: ../plugins/startup-wizard/startup-wizard.c:134
 msgid "Importing files"
@@ -19265,7 +19267,7 @@ msgstr ""
 "para indivíduos com tendência a acessos violentos de raiva.\n"
 "\n"
 "Nós esperamos que você aprecie os resultados do nosso trabalho\n"
-"duro, e estamos esperando ansiosamente suas contribuições!\n"
+"duro, e estamos esperando ansiosamente as suas contribuições!\n"
 
 #: ../shell/main.c:257
 msgid ""
@@ -20512,7 +20514,7 @@ msgstr "_Confidencial"
 
 #: ../ui/evolution-event-editor.xml.h:31
 msgid "_Free/Busy"
-msgstr "_Livre/Ocupado"
+msgstr "Disponibilidade"
 
 #: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
 #: ../ui/evolution-task-editor.xml.h:21
@@ -20557,7 +20559,7 @@ msgstr "Criar ou editar as regras para filtragem de correio"
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Download messages of accounts/folders marked for offline"
-msgstr "Baixar mensagens das contas/pastas marcadas como desligadas"
+msgstr "Baixar mensagens das contas e pastas marcadas como desconectadas"
 
 #: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
@@ -20620,7 +20622,7 @@ msgstr "_Logs de Depuração"
 
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Download Messages for Offline Usage"
-msgstr "Baixar mensagens para leitura _desconectado"
+msgstr "Baixar mensagens para uso _desconectado"
 
 #: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
@@ -22617,7 +22619,7 @@ msgstr "%s (...)"
 #: ../widgets/misc/e-task-widget.c:303
 #, c-format
 msgid "%s (%d%% complete)"
-msgstr "%s (%d%% cumprida)"
+msgstr "%s (%d%% concluído)"
 
 #: ../widgets/misc/e-url-entry.c:107
 msgid "Click here to go to URL"
diff --git a/po/ru.po b/po/ru.po
index eff0c7f007..6ba0295a80 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,27 +1,28 @@
+# translation of ru.po to Russian
 # translation of evolution to Russian
 #
 # Copyright (C) 2000,2002,2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
+#
+#: ../shell/main.c:683
 # Valek Filippov <frob@df.ru>, 2000.
 # Dmitry Mastrukov  <dmitry@taurussoft.org>, 2001-2003.
 # Leonid Kanter <leon@asplinux.ru>, 2001-2003, 2004, 2005, 2006, 2007, 2008.
 # Michael Yakhontov <mvy@asplinux.ru>, 2003, 2005.
 # Anatol Kamynin <anatol@tiflocomp.ru>, 2008.
-#
-#: ../shell/main.c:683
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution trunk\n"
+"Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-15 15:31+0400\n"
-"PO-Revision-Date: 2008-05-26 19:07+0500\n"
-"Last-Translator: Anatol Kamynin <anatol@tiflocomp.ru>\n"
-"Language-Team: Russian <gnome-cyr@gnome.org>\n"
+"POT-Creation-Date: 2008-08-04 12:17+0300\n"
+"PO-Revision-Date: 2008-08-04 16:58+0300\n"
+"Last-Translator: Leonid Kanter <leon@asplinux.ru>\n"
+"Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
@@ -158,7 +159,7 @@ msgid "calendar view for one or more days"
 msgstr "окно календаря для просмотра одного или более дней"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:758
 msgid "%A %d %b %Y"
 msgstr "%A, %d %b %Y"
 
@@ -169,7 +170,7 @@ msgstr "%A, %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:750
+#: ../calendar/gui/calendar-component.c:761
 #: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
 #: ../calendar/gui/e-week-view-main-item.c:340
 msgid "%a %d %b"
@@ -178,9 +179,9 @@ msgstr "%a, %d %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../calendar/gui/calendar-component.c:763
+#: ../calendar/gui/calendar-component.c:768
+#: ../calendar/gui/calendar-component.c:770
 msgid "%a %d %b %Y"
 msgstr "%a, %d %b %Y"
 
@@ -188,10 +189,10 @@ msgstr "%a, %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:797
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -201,7 +202,7 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:787
 #: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
 #: ../calendar/gui/e-week-view-main-item.c:354
 msgid "%d %b"
@@ -344,12 +345,9 @@ msgstr "активировать"
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
-"'{0}' is a read-only address book source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
-msgstr ""
-"«{0}» — это источник адресной книги, который доступен только для чтения. "
-"Перейдите к виду календаря и выберите календарь, который может принимать "
-"встречи."
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr "«{0}» — это источник адресной книги, который доступен только для чтения. Выберите другую адресную книгу из боковой панели вида «Контакты»."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -397,12 +395,12 @@ msgstr "Не удалось удалить адресную книгу."
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
-"В настоящее время вы можете получить доступ только к адресной книге системы "
+"В настоящее время вы можете получить доступ только к системной адресной книге "
 "GroupWise из Evolution. Пожалуйста, используйте какой-нибудь другой почтовый "
-"клиент GroupWise, чтобы получить доступ к папкам Часто Используемых "
-"Контактов и Личной Информации GroupWise."
+"клиент GroupWise, чтобы получить доступ к папкам Часто используемых "
+"Контактов и Персональных контактов GroupWise."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
@@ -447,10 +445,8 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Работа компонента адресной книги Evolution неожиданно завершилась."
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
-msgstr ""
-"Выбранное вами изображение слишком велико. Изменить размер перед сохранением?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
+msgstr "Выбранное вами изображение слишком велико. Изменить размер перед сохранением?"
 
 #: ../addressbook/addressbook.error.xml.h:23
 msgid ""
@@ -522,9 +518,8 @@ msgstr ""
 "сервер должен быть обновлен до поддерживаемой версии"
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid ""
-"You do not have enough permissions to delete contact in this Address Book."
-msgstr "У вас недостаточно прав для удаления контакта из этой Адресной книги."
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "У вас недостаточно прав для удаления контактов из этой адресной книги."
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
@@ -533,8 +528,7 @@ msgid ""
 msgstr "Вы изменили этот контакт. Сохранить изменения?"
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "Ваши контакты для {0} не будут доступны до перезапуска Evolution."
 
 #: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
@@ -562,7 +556,7 @@ msgstr "_Использовать как есть"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
@@ -604,7 +598,7 @@ msgstr "Здесь настраивается автозавершение"
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1334
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:396
+#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
@@ -650,8 +644,9 @@ msgstr "Здесь можно управлять вашими сертифика
 #: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:311
-#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1455
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1456
 msgid "On This Computer"
 msgstr "На этом компьютере"
 
@@ -664,31 +659,24 @@ msgstr "На этом компьютере"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:485
-#: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1055
+#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:205
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Личное"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "На серверах LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
-msgid "_Contact"
-msgstr "Контакт"
-
 #: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "Создание нового контакта"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgid "Contact _List"
-msgstr "Список _контактов"
-
 #: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "Создание нового списка контактов"
@@ -698,10 +686,6 @@ msgstr "Создание нового списка контактов"
 msgid "New Address Book"
 msgstr "Новая адресная книга"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgid "Address _Book"
-msgstr "Адресная _книга"
-
 #: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "Создать новую адресную книгу"
@@ -730,7 +714,7 @@ msgstr "Скопировать _книгу локально для автоно�
 #: ../calendar/gui/dialogs/calendar-setup.c:377
 #: ../calendar/gui/dialogs/calendar-setup.c:388
 #: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2366
+#: ../plugins/itip-formatter/itip-formatter.c:2368
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Общие"
@@ -751,12 +735,12 @@ msgstr "Аутентификация"
 
 #: ../addressbook/gui/component/addressbook-config.c:977
 #: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Подробности"
 
 #: ../addressbook/gui/component/addressbook-config.c:978
-#: ../mail/em-folder-browser.c:959
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "Поиск"
 
@@ -770,12 +754,12 @@ msgid "Address Book Properties"
 msgstr "Свойства адресной книги"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Перенос..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:195
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Переносится «%s»:"
@@ -856,11 +840,11 @@ msgstr "Сохранить как VCard..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
+#: ../calendar/gui/calendar-component.c:620
+#: ../calendar/gui/e-calendar-table.c:1596
 #: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2095 ../mail/em-folder-view.c:1345
+#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1347
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -1008,8 +992,7 @@ msgid "Email address"
 msgstr "Электронная почта"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
+msgid "Evolution will use this email address to authenticate you with the server."
 msgstr "Этот адрес будет использоваться для идентификации вас на сервере."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:19
@@ -1242,7 +1225,7 @@ msgstr "карточек"
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
 #: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:401
 msgid "minutes"
 msgstr "минут"
 
@@ -1348,7 +1331,7 @@ msgstr "Телефон"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Служебное"
 
@@ -1370,9 +1353,9 @@ msgid "_Birthday:"
 msgstr "_День рождения:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:788
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1848
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Календарь:"
 
@@ -1475,7 +1458,7 @@ msgstr "Адрес"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:521
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:179
 #: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
@@ -2492,6 +2475,7 @@ msgid "Service"
 msgstr "Служба"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:693
 #: ../plugins/save-calendar/csv-format.c:375
@@ -2783,8 +2767,7 @@ msgstr "Имя _списка:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr ""
-"_Введите адрес почты или перетащите контакт в список, приведённый ниже:"
+msgstr "_Введите адрес почты или перетащите контакт в список, приведённый ниже:"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
 msgid "Contact List Members"
@@ -2800,7 +2783,7 @@ msgstr "_Участники"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
 #: ../addressbook/gui/widgets/e-addressbook-view.c:213
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:507
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Книга"
 
@@ -2845,14 +2828,15 @@ msgstr ""
 "Имя или адрес этого контактного лица уже существуют\n"
 "в этой папке. Всё равно хотите добавить?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:185
-msgid "Merge Contact"
-msgstr "Объединить контакты"
-
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
 #: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "_Объединить"
 
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "Объединить контакты"
+
 #: ../addressbook/gui/merging/eab-contact-merging.c:253
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
@@ -2865,8 +2849,8 @@ msgstr "Эл. почта"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:162
-#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Любое поле содержит"
 
@@ -2895,7 +2879,7 @@ msgstr[2] "%d контактов"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-addressbook-view.c:227
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:514
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Запрос"
 
@@ -2906,7 +2890,7 @@ msgstr "Ошибка при получении вида книги"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-table.c:3353
 #: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
@@ -2938,8 +2922,8 @@ msgid "Save as vCard..."
 msgstr "Сохранить как vCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:1124
-#: ../calendar/gui/e-calendar-table.c:1365
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1574
 #: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
@@ -2990,19 +2974,18 @@ msgid "Mo_ve to Address Book..."
 msgstr "Пере_местить в адресную книгу..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "_Вырезать"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:453
-#: ../calendar/gui/e-calendar-table.c:1373
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1582
 #: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2011 ../mail/em-folder-tree.c:996
-#: ../mail/em-folder-view.c:1330 ../mail/message-list.c:2045
+#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Копировать"
 
@@ -3054,7 +3037,7 @@ msgstr "Телефон в машине"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:143
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3199,11 +3182,11 @@ msgstr "Веб-сайт"
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
 #: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Ширина"
@@ -3214,11 +3197,11 @@ msgstr "Ширина"
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
 #: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Высота"
@@ -3248,7 +3231,17 @@ msgstr "Максимальная длина имени поля"
 msgid "Column Width"
 msgstr "Ширина столбца"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:173
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Поиск контактов..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3262,7 +3255,7 @@ msgstr ""
 "\n"
 "Или дважды щелкните здесь, чтобы создать новый контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:176
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3276,7 +3269,7 @@ msgstr ""
 "\n"
 "Дважды щелкните здесь, чтобы создать новый контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3286,7 +3279,7 @@ msgstr ""
 "\n"
 "Поиск контакта."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3296,7 +3289,7 @@ msgstr ""
 "\n"
 "Нет элементов для отображения в этом окне."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:500
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Адаптер"
 
@@ -3326,7 +3319,7 @@ msgid "_Open Link in Browser"
 msgstr "_Открыть ссылку в браузере"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2810
 msgid "_Copy Link Location"
 msgstr "_Копировать ссылку"
 
@@ -3374,7 +3367,7 @@ msgstr "Видеочат"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:806
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/gnome-cal.c:2376
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
@@ -3390,8 +3383,7 @@ msgstr "Календарь"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:114
 msgid "Free/Busy"
 msgstr "Cвободен/занят"
 
@@ -3413,12 +3405,14 @@ msgid "Web Log"
 msgstr "Веб-журнал"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2355
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "День рождения"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2356
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Годовщина"
 
@@ -3464,7 +3458,7 @@ msgstr "Свой контакт не определён"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Отказ в доступе"
 
@@ -3486,11 +3480,11 @@ msgstr "Протокол не поддерживается"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "Отменено"
 
@@ -3605,13 +3599,11 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:166
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-"База данных для этой адресной книги не смогла обработать текущий запрос."
+msgstr "База данных для этой адресной книги не смогла обработать текущий запрос."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:169
 msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-"База данных для этой адресной книги отказалась обрабатывать текущий запрос."
+msgstr "База данных для этой адресной книги отказалась обрабатывать текущий запрос."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid "This query did not complete successfully."
@@ -3772,7 +3764,7 @@ msgstr "Сохранить в адресной книге"
 msgid "Card View"
 msgstr "Вид карточек"
 
-#: ../addressbook/importers/evolution-csv-importer.c:623
+#: ../addressbook/importers/evolution-csv-importer.c:658
 #: ../addressbook/importers/evolution-ldif-importer.c:498
 #: ../addressbook/importers/evolution-vcard-importer.c:250
 #: ../calendar/importers/icalendar-importer.c:306
@@ -3780,27 +3772,27 @@ msgstr "Вид карточек"
 msgid "Importing..."
 msgstr "Импорт..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:825
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV или Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "Программа импортирования Outlook CSV или Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:834
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV или Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Программа импортирования Mozilla CSV или Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:843
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV или Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "Программа импортирования Evolution CSV и Tab"
 
@@ -3868,7 +3860,7 @@ msgstr "Формат"
 #: ../widgets/table/e-table-header-item.c:1908
 #: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
-msgstr "Верхний колонтитул"
+msgstr "Заголовок"
 
 #: ../addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
@@ -3968,7 +3960,7 @@ msgstr "С тенью"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:985
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -4010,8 +4002,7 @@ msgstr "Copyright (C) 2000, Ximian, Inc."
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
-msgstr ""
-"Так можно проверить виджет правки стиля отображения контакта при печати"
+msgstr "Так можно проверить виджет правки стиля отображения контакта при печати"
 
 #: ../addressbook/printing/test-print.c:43
 msgid "Contact Print Test"
@@ -4072,8 +4063,7 @@ msgid "NUMBER"
 msgstr "NUMBER"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:102
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Ошибка аргументов командной строки, используйте параметр --help, чтобы "
 "просмотреть доступные аргументы."
@@ -4097,20 +4087,16 @@ msgstr "Необрабатываемая ошибка"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
-"appointments."
-msgstr ""
-"«{0}» — это источник календаря, доступный только для чтения. Смените "
-"календарь на тот, который может принимать встречи."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr "«{0}» — это источник календаря, доступный только для чтения, и не может быть изменён. Выберите в боковой панели вида «Календарь» другой источник календаря."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
-msgstr ""
-"«{0}» — это источник календаря, доступный только для чтения. Перейдите к "
-"виду календаря и выберите календарь, который может принимать встречи."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr "«{0}» — это источник календаря, доступный только для чтения. Выберите другой календарь, который может принимать встречи."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
@@ -4147,13 +4133,11 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "Вся информация о этих задачах будет безвозвратно удалена."
 
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr "Все сведения об этой встрече будут безвозвратно удалены."
 
 #: ../calendar/calendar.error.xml.h:12
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "Все сведения об этом собрании будут безвозвратно удалены."
 
 #: ../calendar/calendar.error.xml.h:13
@@ -4267,8 +4251,7 @@ msgstr ""
 "смогли принять эту задачу."
 
 #: ../calendar/calendar.error.xml.h:38
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Сообщения будут разосланы по электронной почте всем участникам, чтобы дать "
 "им возможность ответить."
@@ -4362,8 +4345,8 @@ msgid "The calendar is not marked for offline usage."
 msgstr "Этот календарь не отмечен для автономного использования."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
-msgstr "Этот список заметок не отмечен для автономного использования"
+msgid "The memo list is not marked for offline usage."
+msgstr "Этот список заметок не отмечен для автономного использования."
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
@@ -4452,12 +4435,11 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Ваши задачи будут недоступны до перезапуска Evolution."
 
 #: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Отклонить изменения"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:492
-#: ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
 msgid "_Save"
 msgstr "_Сохранить"
 
@@ -4466,7 +4448,7 @@ msgid "_Save Changes"
 msgstr "_Сохранить изменения"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Отправить"
@@ -4522,12 +4504,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Не удалось прочитать блок приложения ToDo пилота"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2357
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "Календарь и задачи"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:1403
 msgid "Calendars"
 msgstr "Календари"
 
@@ -4569,17 +4551,17 @@ msgstr "_Заметки"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:353
+#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
+#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
 #: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "Заметки"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1982
+#: ../calendar/gui/tasks-component.c:540
+#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
 #: ../calendar/gui/tasks-control.c:508
 #: ../calendar/importers/icalendar-importer.c:74
 #: ../calendar/importers/icalendar-importer.c:735
@@ -4617,7 +4599,7 @@ msgstr[2] "минут"
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:397
+#: ../plugins/google-account-setup/google-source.c:402
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "час"
@@ -4635,10 +4617,10 @@ msgstr "Встречи"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1595
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1600
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
 #: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1002
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Адрес:"
 
@@ -4647,14 +4629,15 @@ msgid "Snooze _time:"
 msgstr "Напомнить _через:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Правка"
 
@@ -4666,32 +4649,32 @@ msgstr "Напомнить по_зже"
 msgid "location of appointment"
 msgstr "место проведения встречи"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1577
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
 msgid "No summary available."
 msgstr "Сводка недоступна."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No description available."
 msgstr "Описание не доступно."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1478
 msgid "No location information available."
 msgstr "Данные об адресе недоступны."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
 #, c-format
 msgid "You have %d alarms"
 msgstr "У вас есть %d сигналов"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1707
-#: ../mail/mail-component.c:1584
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1684
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1712
+#: ../mail/mail-component.c:1587
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4703,7 +4686,7 @@ msgstr ""
 "Вместо этого Evolution отобразит нормальный диалог\n"
 "напоминания."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1713
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4720,7 +4703,7 @@ msgstr ""
 "\n"
 "Вы действительно хотите запустить эту программу?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1732
 msgid "Do not ask me about this program again."
 msgstr "Не задавать больше этот вопрос."
 
@@ -4793,8 +4776,7 @@ msgid "Calendars to run alarms for"
 msgstr "Календари для запуска напоминаний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Цвет маркера времени в расписании (для значения по умолчанию оставьте "
 "пустым)."
@@ -4877,8 +4859,7 @@ msgstr "Час начала рабочего дня, в 24-часовом фор
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr ""
-"Интервалы, отображаемые в режимах \"День\" и \"Рабочая неделя\", в минутах."
+msgstr "Интервалы, отображаемые в режимах \"День\" и \"Рабочая неделя\", в минутах."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Last alarm time"
@@ -4986,8 +4967,7 @@ msgstr "Каталог для сохранения звуковых файлов
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr ""
-"Отображать поле \"Просьба ответить\" в редакторе событий/задач/собраний"
+msgstr "Отображать поле \"Просьба ответить\" в редакторе событий/задач/собраний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Show Role field in the event/task/meeting editor"
@@ -5010,12 +4990,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Отображать поле состояния в редакторе событий/задач/собраний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Показывать панель предварительного просмотра"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Отображать панель предварительного просмотра."
 
@@ -5087,8 +5067,7 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Единицы напоминания по умолчанию, \"minutes\", \"hours\" или \"days\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Единицы для определения момента скрытия задач, \"minutes\", \"hours\" или "
 "\"days\"."
@@ -5126,8 +5105,7 @@ msgid "Whether to display the end time of events in the week and month views."
 msgstr "Показывать ли время завершения событий в обзоре недели и месяца."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Отображать ли маркер текущего времени в календаре."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
@@ -5140,8 +5118,7 @@ msgstr "Устанавливать ли напоминание для событ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr ""
-"Отображать ли поле \"Просьба ответить\" в редакторе событий/задач/собраний"
+msgstr "Отображать ли поле \"Просьба ответить\" в редакторе событий/задач/собраний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether to show categories field in the event/meeting editor"
@@ -5156,8 +5133,7 @@ msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Отображать ли поле состояния в редакторе событий/задач/собраний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Показывать ли время в 24-часовом формате вместо am/pm."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
@@ -5276,7 +5252,7 @@ msgstr "Очистить элементы старше чем"
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
 #: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:398
+#: ../plugins/google-account-setup/google-source.c:403
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "дней"
@@ -5285,103 +5261,103 @@ msgstr "дней"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
+#: ../calendar/gui/calendar-component.c:274
+#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
 #: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
-#: ../calendar/gui/tasks-component.c:231
+#: ../calendar/gui/tasks-component.c:232
 msgid "On The Web"
 msgstr "В Сети"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Дни рождения и годовщины"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Погода"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:616
 msgid "_New Calendar"
 msgstr "_Создать календарь"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2090
+#: ../calendar/gui/calendar-component.c:617
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Копировать..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2104
+#: ../calendar/gui/calendar-component.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
+#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Свойства"
 
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:950
 msgid "Failed upgrading calendars."
 msgstr "Ошибка обновления календарей."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1249
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Не удалось открыть календарь «%s» для создания событий и совещаний"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1265
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Нет доступного календаря для создания событий и совещаний"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1378
 msgid "Calendar Source Selector"
 msgstr "Выбор источника календаря"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Новая встреча"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
 msgid "_Appointment"
 msgstr "_Встреча"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Создать новую встречу"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Новое собрание"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
 msgid "M_eeting"
 msgstr "_Собрание"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Создать новое приглашение на собрание"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Новая встреча на весь день"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
 msgid "All Day A_ppointment"
 msgstr "_Ежедневная встреча"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Создать новую ежедневную встречу"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Новый календарь"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Cale_ndar"
 msgstr "Кале_ндарь"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Создать новый календарь"
 
@@ -5402,15 +5378,219 @@ msgid "Month View"
 msgstr "как месяц"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "Любое поле"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Вложения"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Участник"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "Бизнес"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Категория"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Классификация"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "Выполнение"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Конфиденциальное"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Описание"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "Описание содержит"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "Не существует"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Существует"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Избранное"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "Подарки"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "Задачи/Цели"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Выходной"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "Карточки выходного дня"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "Горячие контакты"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Идеи"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "Международный"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "Ключевой клиент"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "Разное"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Следующие 7 дней"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "Организатор"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "Телефонные звонки"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "Личное"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "Общее"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:298
+msgid "Recurrence"
+msgstr "Повторение"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Состояние"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Стратегии"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Summary"
+msgstr "Сводка"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Сводка содержит"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "Поставщики"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "Время и затраты"
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "VIP"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "Ожидание"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "содержит"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "не содержит"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "является"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "не является"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Ошибка при открытии календаря"
@@ -5427,7 +5607,7 @@ msgstr "Отказ в доступе при открытии календаря"
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:605
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "Изменить сигнал"
 
@@ -5530,7 +5710,10 @@ msgstr "дополнительное время каждые"
 msgid "hour(s)"
 msgstr "часов"
 
+#. Translators: This is the second half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../plugins/google-account-setup/google-contacts-source.c:247
 msgid "minute(s)"
 msgstr "минут"
 
@@ -5549,12 +5732,11 @@ msgstr "_Добавить"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Сигналы"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
-#: ../composer/e-composer-actions.c:63
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "_Предполагать автоматическое отображение вложения"
 
@@ -5582,8 +5764,7 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
 "<i>%u и %d будут заменены на пользователя и домен из адреса электронной "
 "почты.</i>"
@@ -5628,7 +5809,7 @@ msgid "Display"
 msgstr "Отображение"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Пятница"
@@ -5644,7 +5825,7 @@ msgstr ""
 "Дни"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Понедельник"
@@ -5668,7 +5849,7 @@ msgstr ""
 "Воскресенье"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Выбрать цвет"
 
@@ -5678,7 +5859,7 @@ msgid "S_un"
 msgstr "Вск"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Суббота"
@@ -5696,7 +5877,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Показывать номера недель в навигаторе по датам"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Воскресенье"
@@ -5715,7 +5896,7 @@ msgid "Template:"
 msgstr "Шаблон:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Четверг"
@@ -5730,13 +5911,13 @@ msgid "Time format:"
 msgstr "Формат времени:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Вторник"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Среда"
@@ -5907,40 +6088,40 @@ msgstr "%s Вы сделали изменения. Отменить их?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Вы ничего не изменили. Обновить редактор?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:516
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Ошибка проверки: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:185 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " к "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (Завершено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "Завершено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (к дате"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "К дате"
 
-#: ../calendar/gui/dialogs/comp-editor.c:205
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "Вложенное сообщение - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:210
-#: ../calendar/gui/dialogs/comp-editor.c:383 ../composer/e-msg-composer.c:1725
-#: ../composer/e-msg-composer.c:1944
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
+#: ../composer/e-msg-composer.c:1991
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -5948,29 +6129,211 @@ msgstr[0] "%d вложенное сообщение"
 msgstr[1] "%d вложенных сообщения"
 msgstr[2] "%d вложенных сообщений"
 
-#: ../calendar/gui/dialogs/comp-editor.c:454 ../composer/e-msg-composer.c:2012
-#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1191 ../mail/message-list.c:2046
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
 msgid "_Move"
 msgstr "Пере_местить"
 
-#: ../calendar/gui/dialogs/comp-editor.c:456 ../composer/e-msg-composer.c:2014
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2048
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
 msgid "Cancel _Drag"
 msgstr "Отменить _перенос"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
-#: ../calendar/gui/dialogs/comp-editor.c:2854 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
 #: ../plugins/prefer-plain/prefer-plain.c:74
-#: ../widgets/misc/e-attachment-bar.c:484
+#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "вложение"
 
-#: ../calendar/gui/dialogs/comp-editor.c:821
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "Не удалось обновить объект"
 
-#: ../calendar/gui/dialogs/comp-editor.c:971
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "Изменить встречу"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "Собрание - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "Встреча - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Назначенная задача - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "Задача - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "Заметка - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "Нет сводки"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "Нажмите, чтобы закрыть текущее окно"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "Копировать выделенный текст в буфер обмена"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "Вырезать выделенный текст в буфер обмена"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "Нажмите, чтобы просмотреть справку"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "Вставить текст из буфера обмена"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "Нажмите, чтобы сохранить текущее окно"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "Выделить весь текст"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "_Классификация"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_Файл"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_Справка"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "_Вставить"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "_Параметры"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
+msgid "_View"
+msgstr "_Вид"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_Вложение..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "Нажмите, чтобы вложить файл"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "_Категории"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "Переключает отображение категорий"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "Часовой _пояс"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "Переключает отображение часового пояса"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "Пу_бличное"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "Классифицировать как публичное"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "_Личное"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "Классифицировать как личное"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "_Конфиденциальное"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "Классифицировать как конфиденциальное"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "Поле «_Должность»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "Переключает отображение поля «Должность»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "П_росьба ответить"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Переключает отображение поля «Просьба ответить»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "Поле _состояния"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "Переключает отображение поля «Состояние»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "Поле _типа"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Переключает отображение поля типа участников"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "Недавние доку_менты"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "Вложить"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1879
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5978,88 +6341,48 @@ msgstr[0] "<b>%d</b> вложение"
 msgstr[1] "<b>%d</b> вложения"
 msgstr[2] "<b>%d</b> вложений"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1003
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "Скрыть _панель вложений"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1006
-#: ../calendar/gui/dialogs/comp-editor.c:1589
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "Показать _панель вложений"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
-#: ../calendar/gui/dialogs/event-page.c:1964
-#: ../calendar/gui/dialogs/task-page.c:1261 ../composer/e-msg-composer.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:2036
 #: ../composer/e-msg-composer.c:1049
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Добавить вложение..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1613
+#: ../calendar/gui/dialogs/comp-editor.c:2244
 #: ../mail/em-format-html-display.c:2196
 msgid "Show Attachments"
 msgstr "Отображать вложения"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1614
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "Нажмите клавишу \"Пробел\" для переключения панели вложений"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2225
-#: ../calendar/gui/dialogs/comp-editor.c:2268
-msgid "Edit Appointment"
-msgstr "Изменить встречу"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2231
-#: ../calendar/gui/dialogs/comp-editor.c:2274
-#, c-format
-msgid "Meeting - %s"
-msgstr "Собрание - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Appointment - %s"
-msgstr "Встреча - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2237
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Назначенная задача - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Task - %s"
-msgstr "Задача - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2242
-#: ../calendar/gui/dialogs/comp-editor.c:2285
-#, c-format
-msgid "Memo - %s"
-msgstr "Заметка - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2253
-#: ../calendar/gui/dialogs/comp-editor.c:2295
-msgid "No summary"
-msgstr "Нет Краткого описания"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2943
-#: ../calendar/gui/dialogs/comp-editor.c:2997
-#: ../calendar/gui/dialogs/comp-editor.c:3021
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Изменения этого элемента будут отвергнуты, если по электронной почте придет "
 "обновление."
 
-#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "Не удалось использовать текущую версию!"
 
@@ -6140,96 +6463,142 @@ msgstr "Поручить:"
 msgid "Enter Delegate"
 msgstr "Ввести представителя"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:195
+msgid "_Alarms"
+msgstr "_Сигналы"
+
+#: ../calendar/gui/dialogs/event-editor.c:197
+msgid "Click here to set or unset alarms for this event"
+msgstr "Нажмите, чтобы установить или сбросить сигналы для этого события"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "_Повторение"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "Сделать это событие повторяющимся"
+
+#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Параметры отправки"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "Вставить дополнительные параметры оправки"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "Событие на весь _день"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "Переключает, является ли событие событием на весь день"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "Показать время как _Занят"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "Переключить отображение времени как «занят»"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "Cво_боден/Занят"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "Запросить информацию о занятости для участников"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "Встре_ча"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Повторение"
-
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.c:2832
+#: ../calendar/gui/dialogs/event-page.c:732
+#: ../calendar/gui/dialogs/event-page.c:2715
 msgid "This event has alarms"
 msgstr "Это событие имеет сигналы"
 
-#: ../calendar/gui/dialogs/event-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:795
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Ор_ганизатор:"
 
-#: ../calendar/gui/dialogs/event-page.c:941
+#: ../calendar/gui/dialogs/event-page.c:841
 msgid "_Delegatees"
 msgstr "_Представители"
 
-#: ../calendar/gui/dialogs/event-page.c:943
+#: ../calendar/gui/dialogs/event-page.c:843
 msgid "Atte_ndees"
 msgstr "_Участники"
 
-#: ../calendar/gui/dialogs/event-page.c:1125
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "Событие без даты начала"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "Событие без даты завершения"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
-#: ../calendar/gui/dialogs/memo-page.c:729
-#: ../calendar/gui/dialogs/task-page.c:888
+#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Дата начала неверна"
 
-#: ../calendar/gui/dialogs/event-page.c:1310
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "Неверная дата завершения"
 
-#: ../calendar/gui/dialogs/event-page.c:1333
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "Неверное время начала"
 
-#: ../calendar/gui/dialogs/event-page.c:1340
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "Неверное время завершения"
 
-#: ../calendar/gui/dialogs/event-page.c:1502
-#: ../calendar/gui/dialogs/memo-page.c:769
-#: ../calendar/gui/dialogs/task-page.c:947
+#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "Выбранный организатор больше не имеет учётной записи."
 
-#: ../calendar/gui/dialogs/event-page.c:1508
-#: ../calendar/gui/dialogs/memo-page.c:775
-#: ../calendar/gui/dialogs/task-page.c:953
+#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Требуется организатор."
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/task-page.c:977
+#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Требуется как минимум один участник"
 
-#: ../calendar/gui/dialogs/event-page.c:1965
-#: ../calendar/gui/dialogs/task-page.c:1262
+#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Добавить "
 
-#: ../calendar/gui/dialogs/event-page.c:2708
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Не удалось открыть календарь «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2752
-#: ../calendar/gui/dialogs/memo-page.c:985
-#: ../calendar/gui/dialogs/task-page.c:1923
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Вы действуете от лица %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3050
+#: ../calendar/gui/dialogs/event-page.c:2915
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6237,7 +6606,7 @@ msgstr[0] "%d день до встречи"
 msgstr[1] "%d дня до встречи"
 msgstr[2] "%d дней до встречи"
 
-#: ../calendar/gui/dialogs/event-page.c:3056
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6245,7 +6614,7 @@ msgstr[0] "%d час до встречи"
 msgstr[1] "%d часа до встречи"
 msgstr[2] "%d часов до встречи"
 
-#: ../calendar/gui/dialogs/event-page.c:3062
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6253,22 +6622,22 @@ msgstr[0] "%d минута до встречи"
 msgstr[1] "%d минуты до встречи"
 msgstr[2] "%d минут до встречи"
 
-#: ../calendar/gui/dialogs/event-page.c:3075
+#: ../calendar/gui/dialogs/event-page.c:2940
 msgid "Customize"
 msgstr "Настроить"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3080
+#: ../calendar/gui/dialogs/event-page.c:2945
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:907
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
 #: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
 #: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2020
+#: ../plugins/itip-formatter/itip-formatter.c:2022
 #: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
 #: ../widgets/misc/e-dateedit.c:1731
 #: ../widgets/misc/e-signature-combo-box.c:69
@@ -6343,26 +6712,22 @@ msgstr "И_зменить организатора"
 msgid "Co_ntacts..."
 msgstr "Ко_нтакты..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Организатор"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Организатор:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Заметка"
 
-#: ../calendar/gui/dialogs/memo-page.c:947
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Не удалось открыть заметки в «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1131 ../mail/em-format-html.c:1559
-#: ../mail/em-format-html.c:1617 ../mail/em-format-html.c:1643
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
@@ -6382,7 +6747,7 @@ msgid "_Description:"
 msgstr "_Описание:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Группа:"
@@ -6423,17 +6788,17 @@ msgstr "Эту и последующие записи"
 msgid "All Instances"
 msgstr "Все записи"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:495
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Эта встреча имеет правила повторения, не редактируемые в Evolution."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:816
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "Повторяющаяся дата некорректна"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:929
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "в"
 
@@ -6441,7 +6806,7 @@ msgstr "в"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "первый"
 
@@ -6450,7 +6815,7 @@ msgstr "первый"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:999
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "второй"
 
@@ -6458,7 +6823,7 @@ msgstr "второй"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1004
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "третий"
 
@@ -6466,7 +6831,7 @@ msgstr "третий"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "четвертый"
 
@@ -6474,13 +6839,13 @@ msgstr "четвертый"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "последний"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Другая дата"
 
@@ -6488,7 +6853,7 @@ msgstr "Другая дата"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "с 1-го по 10-е"
 
@@ -6496,7 +6861,7 @@ msgstr "с 1-го по 10-е"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1054
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "с 11-го по 20-е"
 
@@ -6504,45 +6869,45 @@ msgstr "с 11-го по 20-е"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "с 21-го по 31-е"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "день"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr " "
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "случаи"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Добавить исключение"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Не удалось получить выделение для изменения."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Изменить исключение"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Не удалось получить изменение для удаления."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Дата/Время"
 
@@ -6593,12 +6958,12 @@ msgstr "неделя"
 msgid "year(s)"
 msgstr "год(лет)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:409
-#: ../calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:393
 msgid "Completed date is wrong"
 msgstr "Дата выполнения некорректна"
 
-#: ../calendar/gui/dialogs/task-details-page.c:514
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "Веб-страница"
 
@@ -6613,51 +6978,55 @@ msgstr "<span weight=\"bold\">Состояние</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
 #: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "Завершена"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:271
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1064
 msgid "High"
 msgstr "Высокий"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "Выполняется"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:275
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1061
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1062
 msgid "Low"
 msgstr "Низкий"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:273
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1062
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
 msgid "Normal"
 msgstr "Нормальный"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Не началась"
 
@@ -6670,9 +7039,9 @@ msgid "Stat_us:"
 msgstr "Сост_ояние:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
-msgstr "Не определён"
+msgstr "Не определено"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
@@ -6687,25 +7056,37 @@ msgstr "_Приоритет:"
 msgid "_Web Page:"
 msgstr "_Веб-страница:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/dialogs/task-editor.c:112
+msgid "_Status Details"
+msgstr "_Подробности состояния"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+msgid "Click to change or view the status details of the task"
+msgstr "Нажмите, чтобы изменить или просмотреть детали задачи"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "Параметры _отправки"
+
+#: ../calendar/gui/dialogs/task-editor.c:317
 msgid "_Task"
 msgstr "_Задача"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:320
 msgid "Task Details"
 msgstr "Описание задачи"
 
-#: ../calendar/gui/dialogs/task-page.c:454
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Органи_затор:"
 
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "Дата выполнения некорректна"
 
-#: ../calendar/gui/dialogs/task-page.c:1880
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Не удалось открыть задачи в «%s»."
@@ -6808,75 +7189,59 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s для неизвестного типа переключателя"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
 #, c-format
 msgid "Click to open %s"
 msgstr "Нажмите, чтобы открыть %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:134
-#: ../calendar/gui/e-cal-component-preview.c:176 ../filter/filter-rule.c:820
-#: ../shell/e-shell-folder-title-bar.c:586
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
 msgid "Untitled"
 msgstr "Неозаглавленное"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:186
-#: ../calendar/gui/e-cal-component-preview.c:216
-#: ../calendar/gui/e-cal-component-preview.c:227
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
 msgstr "Дата начала:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
-#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
 #: ../calendar/gui/e-itip-control.c:1218
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Описание:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:235
-#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "Веб-страница:"
 
-#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:210
 #: ../calendar/gui/e-itip-control.c:1162
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Сводка:"
 
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Дата выполнения:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:246
 #: ../calendar/gui/e-itip-control.c:1186
 #: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:1027
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Состояние:"
 
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Приоритет:"
 
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "Общее"
-
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "Личное"
-
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "Конфиденциальное"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Дата завершения"
@@ -6886,20 +7251,13 @@ msgstr "Дата завершения"
 msgid "Start Date"
 msgstr "Дата начала"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:361
-msgid "Summary"
-msgstr "Сводка"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Свободен"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:620
 #: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "Занят"
@@ -6936,12 +7294,12 @@ msgstr "Нет"
 #: ../calendar/gui/e-meeting-list-view.c:167
 #: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2045
-#: ../plugins/plugin-manager/plugin-manager.c:69
-#: ../widgets/misc/e-attachment-bar.c:852
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "Неизвестно"
@@ -6967,9 +7325,9 @@ msgstr "Выберите папку для сохранения выделенн
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1367
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
 #: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1341 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "Со_хранить как..."
 
@@ -6987,126 +7345,152 @@ msgstr "_Сохранить выделенное"
 msgid "Open in %s..."
 msgstr "Открыть в программе %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* Нет краткого описания *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2224
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Организатор: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:377
+#: ../calendar/gui/e-calendar-view.c:2228
+#, c-format
+msgid "Organizer: %s"
+msgstr "Организатор: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "Начало: "
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "Завершение: "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:670
+#: ../calendar/gui/e-calendar-table.c:879
 #: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Удаление выделенных объектов"
 
-#: ../calendar/gui/e-calendar-table.c:954
+#: ../calendar/gui/e-calendar-table.c:1163
 #: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Обновление объектов"
 
-#: ../calendar/gui/e-calendar-table.c:1139
+#: ../calendar/gui/e-calendar-table.c:1348
 #: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "Сохранить как..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
+#: ../calendar/gui/e-calendar-table.c:1571
 #: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Task"
 msgstr "Новая _задача"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "Открыть _веб-страницу"
 
-#: ../calendar/gui/e-calendar-table.c:1368
+#: ../calendar/gui/e-calendar-table.c:1577
 #: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "_Печать..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
+#: ../calendar/gui/e-calendar-table.c:1581
 #: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Вырезать"
 
-#: ../calendar/gui/e-calendar-table.c:1374
+#: ../calendar/gui/e-calendar-table.c:1583
 #: ../calendar/gui/e-calendar-view.c:1669
 #: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "Вст_авить"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Назначить задачу"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Переслать как iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "По_метить как выполненное"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "По_метить выбранную задачу как выполненную"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "По_метить как невыполненные"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "По_метить выбранные задачи как выполненные"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "У_далить выделенные задачи"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Нажмите, чтобы добавить задачу"
@@ -7129,6 +7513,7 @@ msgid "Due date"
 msgstr "Срок выполнения"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/tasktypes.xml.h:37
 #: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "Приоритет"
@@ -7137,13 +7522,6 @@ msgstr "Приоритет"
 msgid "Start date"
 msgstr "Дата начала"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:545
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Состояние"
-
 #: ../calendar/gui/e-calendar-view.c:1349
 msgid "Moving items"
 msgstr "Перемещение элементов"
@@ -7205,7 +7583,7 @@ msgstr "_Переслать как iCalendar..."
 msgid "_Reply"
 msgstr "_Ответить"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1335
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
 #: ../mail/em-popup.c:567 ../mail/em-popup.c:578
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
@@ -7223,26 +7601,14 @@ msgstr "Удалить это вхождение"
 msgid "Delete _All Occurrences"
 msgstr "Удалить все вхождения"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2227
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Организатор: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2231
-#, c-format
-msgid "Organizer: %s"
-msgstr "Организатор: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2247 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Адрес: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2281
+#: ../calendar/gui/e-calendar-view.c:2278
 #, c-format
 msgid "Time: %s %s"
 msgstr "Время: %s %s"
@@ -7282,19 +7648,19 @@ msgstr "Деления через %02i минут"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1523
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1672
 msgid "%A %d %B"
 msgstr "%A, %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:767 ../calendar/gui/e-week-view.c:505
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-week-view.c:508
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
 
@@ -7418,12 +7784,12 @@ msgstr ""
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2033
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Accepted"
 msgstr "Принято"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2036
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "Экспериментально принятый"
 
@@ -7431,7 +7797,7 @@ msgstr "Экспериментально принятый"
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
 #: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2039
+#: ../plugins/itip-formatter/itip-formatter.c:2041
 msgid "Declined"
 msgstr "Отклонено"
 
@@ -7439,14 +7805,11 @@ msgstr "Отклонено"
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
-msgstr ""
-"Собрание было отменено, но оно не может быть найдено в ваших календарях"
+msgstr "Собрание было отменено, но оно не может быть найдено в ваших календарях"
 
 #: ../calendar/gui/e-itip-control.c:1285
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
-msgstr ""
-"Задача была отменена, но она не может быть найдена в ваших списках задач"
+msgid "The task has been canceled, however it could not be found in your task lists"
+msgstr "Задача была отменена, но она не может быть найдена в ваших списках задач"
 
 #: ../calendar/gui/e-itip-control.c:1363
 #, c-format
@@ -7639,13 +8002,11 @@ msgstr "Объект некорректен и не может быть обно
 
 #: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr ""
-"Этот ответ пришел не от текущего участника.  Добавить его, как участника?"
+msgstr "Этот ответ пришел не от текущего участника.  Добавить его, как участника?"
 
 #: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
-"Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
+msgstr "Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
 
 #: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
@@ -7751,49 +8112,49 @@ msgstr "Участники"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
 msgid "Individual"
 msgstr "Индивидуально"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
 #: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Группа"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:967
+#: ../calendar/gui/print.c:983
 msgid "Resource"
 msgstr "Источник"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:968
+#: ../calendar/gui/print.c:984
 msgid "Room"
 msgstr "Комната"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/print.c:998
 msgid "Chair"
 msgstr "Председатель"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
 #: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
 msgid "Required Participant"
 msgstr "Требуемые участники"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/print.c:1000
 msgid "Optional Participant"
 msgstr "Дополнительные участники"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1001
 msgid "Non-Participant"
 msgstr "Не участвует"
 
@@ -7812,7 +8173,7 @@ msgstr "Экспериментальный"
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
 #: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2042
+#: ../plugins/itip-formatter/itip-formatter.c:2044
 msgid "Delegated"
 msgstr "Поручено"
 
@@ -7917,10 +8278,6 @@ msgstr "Нача_ло:"
 msgid "_End time:"
 msgstr "Коне_ц:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Участник"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Нажмите, чтобы добавить участника"
@@ -8000,7 +8357,7 @@ msgstr "Выбор часового пояса"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -8154,11 +8511,11 @@ msgstr "Информация iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Вы должны быть участником события."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:465
 msgid "_New Memo List"
 msgstr "_Новый список заметок"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:545
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8166,7 +8523,7 @@ msgstr[0] "%d заметка"
 msgstr[1] "%d заметки"
 msgstr[2] "%d заметок"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8174,56 +8531,44 @@ msgstr[0] ", выделено %d"
 msgstr[1] ", выделено %d"
 msgstr[2] ", выделено %d"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:594
 msgid "Failed upgrading memos."
 msgstr "Не удалось обновить заметки."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:954
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "Не удалось открыть список заметок «%s» для создания событий и собраний"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:967
 msgid "There is no calendar available for creating memos"
 msgstr "Нет календаря, доступного для создания заметок"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1077
 msgid "Memo Source Selector"
 msgstr "Выбор источника заметок"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Новая заметка"
 
-#: ../calendar/gui/memos-component.c:1260
-msgid "Mem_o"
-msgstr "З_аметка"
-
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Создать новую заметку"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Новая общая заметка"
 
-#: ../calendar/gui/memos-component.c:1268
-msgid "_Shared memo"
-msgstr "_Общая заметка"
-
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Создать новую общую заметку"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Новый список заметок"
 
-#: ../calendar/gui/memos-component.c:1276
-msgid "Memo li_st"
-msgstr "Список з_аметок"
-
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Создать новый список заметок"
 
@@ -8231,6 +8576,10 @@ msgstr "Создать новый список заметок"
 msgid "Print Memos"
 msgstr "Напечатать заметки"
 
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "Следующие 7 дней"
+
 #: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8433,62 +8782,62 @@ msgstr "Пт"
 msgid "Sa"
 msgstr "Cб"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Встреча"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Задание"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Сводка: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "Участники: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Состояние: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Приоритет: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Завершено процентов: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Категории: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Контакты: "
 
 #. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:2762
 msgid "Upcoming Appointments"
 msgstr "Следующие встречи"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:456
 msgid "_New Task List"
 msgstr "_Новый список задач"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:536
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8496,52 +8845,44 @@ msgstr[0] "%d задача"
 msgstr[1] "%d задачи"
 msgstr[2] "%d задач"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:585
 msgid "Failed upgrading tasks."
 msgstr "Не удалось обновить задачи."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:942
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Не удалось открыть список задач «%s» для создания событий и собраний"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:955
 msgid "There is no calendar available for creating tasks"
 msgstr "Нет календаря, доступного для создания задач"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1066
 msgid "Task Source Selector"
 msgstr "Выбор источника задач"
 
-#: ../calendar/gui/tasks-component.c:1324
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Новая задача"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Создать новую задачу"
 
-#: ../calendar/gui/tasks-component.c:1332
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Новая назначенная задача"
 
-#: ../calendar/gui/tasks-component.c:1333
-msgid "Assigne_d Task"
-msgstr "Назначенная за_дача"
-
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Создать новую назначенную задачу"
 
-#: ../calendar/gui/tasks-component.c:1340
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Новый список задач"
 
-#: ../calendar/gui/tasks-component.c:1341
-msgid "Tas_k list"
-msgstr "Списо_к задач"
-
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Создать новый список задач"
 
@@ -8557,7 +8898,7 @@ msgstr ""
 "\n"
 "Действительно уничтожить эти задания?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1131
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
 msgid "Do not ask me again."
 msgstr "Не задавать больше этот вопрос."
 
@@ -8565,6 +8906,27 @@ msgstr "Не задавать больше этот вопрос."
 msgid "Print Tasks"
 msgstr "Напечатать задачи"
 
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% Завершено"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Отменено"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "Выполняется"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "больше чем"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "меньше чем"
+
 #: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Встречи и собрания"
@@ -10141,202 +10503,198 @@ msgstr "Не удалось открыть автоматически сохра
 msgid "Unable to retrieve message from editor"
 msgstr "Не удалось получить сообщение из редактора"
 
-#: ../composer/e-composer-actions.c:46
+#: ../composer/e-composer-actions.c:47
 msgid "Insert Attachment"
 msgstr "Вставить вложение"
 
-#: ../composer/e-composer-actions.c:50
+#: ../composer/e-composer-actions.c:51
 msgid "A_ttach"
 msgstr "В_ложить"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:143
 msgid "Untitled Message"
 msgstr "Неозаглавленное сообщение"
 
-#: ../composer/e-composer-actions.c:464 ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "_Вложение..."
-
-#: ../composer/e-composer-actions.c:466
+#: ../composer/e-composer-actions.c:474
 msgid "Attach a file"
 msgstr "Вложить файл"
 
-#: ../composer/e-composer-actions.c:471 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Закрыть"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:481
 msgid "Close the current file"
 msgstr "Закрыть текущий файл"
 
-#: ../composer/e-composer-actions.c:478 ../mail/em-folder-view.c:1342
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Печать..."
 
-#: ../composer/e-composer-actions.c:485 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
 #: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Пред_варительный просмотр"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:502
 msgid "Save the current file"
 msgstr "Сохранить текущий файл"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:507
 msgid "Save _As..."
 msgstr "Сохранить как..."
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:509
 msgid "Save the current file with a different name"
 msgstr "Сохранить текущий файл под другим именем"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:514
 msgid "Save _Draft"
 msgstr "Сохранить _черновик"
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:516
 msgid "Save as draft"
 msgstr "Сохранить как черновик"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:521
 msgid "S_end"
 msgstr "Отпр_авить"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:523
 msgid "Send this message"
 msgstr "Отправить это сообщение"
 
-#: ../composer/e-composer-actions.c:520 ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "Параметры _отправки"
-
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:530
 msgid "Insert Send options"
 msgstr "Вставить параметры отправки"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "_Новое сообщение"
+
+#: ../composer/e-composer-actions.c:537
+msgid "Open New Message window"
+msgstr "Открыть окно создания нового сообщения"
+
+#: ../composer/e-composer-actions.c:544
 msgid "Character _Encoding"
 msgstr "Кодировка _символов"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:551
 msgid "_Security"
 msgstr "_Безопасность"
 
-#: ../composer/e-composer-actions.c:546
+#: ../composer/e-composer-actions.c:561
 msgid "PGP _Encrypt"
 msgstr "За_шифровать с помощью PGP"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:563
 msgid "Encrypt this message with PGP"
 msgstr "Зашифровать это сообщение с помощью PGP"
 
-#: ../composer/e-composer-actions.c:554
+#: ../composer/e-composer-actions.c:569
 msgid "PGP _Sign"
 msgstr "Подпи_сать с помощью PGP"
 
-#: ../composer/e-composer-actions.c:556
+#: ../composer/e-composer-actions.c:571
 msgid "Sign this message with your PGP key"
 msgstr "Подписать это сообщение вашим PGP-ключом"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:577
 msgid "_Prioritize Message"
 msgstr "Изменить _приоритет сообщения"
 
-#: ../composer/e-composer-actions.c:564
+#: ../composer/e-composer-actions.c:579
 msgid "Set the message priority to high"
 msgstr "Установить высокий приоритет сообщения"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:585
 msgid "Re_quest Read Receipt"
 msgstr "Запросить уведомление о прочт_ении"
 
-#: ../composer/e-composer-actions.c:572
+#: ../composer/e-composer-actions.c:587
 msgid "Get delivery notification when your message is read"
 msgstr ""
 "Установите, чтобы получить уведомление о доставке по прочтении вашего "
 "сообщения"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:593
 msgid "S/MIME En_crypt"
 msgstr "Зашифровать с _помощью S/MIME"
 
-#: ../composer/e-composer-actions.c:580
+#: ../composer/e-composer-actions.c:595
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Зашифровать это сообщение вашим сертификатом шифрования S/MIME"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:601
 msgid "S/MIME Sig_n"
 msgstr "Подписать с по_мощью S/MIME"
 
-#: ../composer/e-composer-actions.c:588
+#: ../composer/e-composer-actions.c:603
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Подписать это сообщение вашим сертификатом шифрования S/MIME"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:609
 msgid "_Bcc Field"
 msgstr "Поле скрытой копии"
 
-#: ../composer/e-composer-actions.c:596
+#: ../composer/e-composer-actions.c:611
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Переключить отображение поля скрытой копии"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:617
 msgid "_Cc Field"
 msgstr "Поле копии"
 
-#: ../composer/e-composer-actions.c:604
+#: ../composer/e-composer-actions.c:619
 msgid "Toggles whether the CC field is displayed"
 msgstr "Переключить отображение поля копии"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:625
 msgid "_From Field"
 msgstr "Поле \"От\""
 
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:627
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Переключить отображение выбора для поля \"От\""
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:633
 msgid "_Post-To Field"
 msgstr "Поле \"Post-To\""
 
-#: ../composer/e-composer-actions.c:620
+#: ../composer/e-composer-actions.c:635
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Переключить отображение поля \"Post-To\""
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:641
 msgid "_Reply-To Field"
 msgstr "Поле \"Об_ратный адрес\""
 
-#: ../composer/e-composer-actions.c:628
+#: ../composer/e-composer-actions.c:643
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Переключить отображение поля \"Обратный адрес\""
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:649
 msgid "_Subject Field"
 msgstr "Поле _темы"
 
-#: ../composer/e-composer-actions.c:636
+#: ../composer/e-composer-actions.c:651
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Переключает отображение поля \"Темы\""
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:657
 msgid "_To Field"
 msgstr "Поле \"_Кому\""
 
-#: ../composer/e-composer-actions.c:644
+#: ../composer/e-composer-actions.c:659
 msgid "Toggles whether the To field is displayed"
 msgstr "Переключить отображение поля \"Кому\""
 
-#: ../composer/e-composer-actions.c:685 ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "Вложить"
-
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Перечислите получателей сообщения"
@@ -10410,8 +10768,7 @@ msgid "Show _Attachment Bar"
 msgstr "Показать панель _вложений"
 
 #: ../composer/e-msg-composer.c:873
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Не удалось подписать исходящее сообщение: нет сертификата подписи для этой "
 "учётной записи"
@@ -10437,11 +10794,11 @@ msgstr[2] "Вложений"
 msgid "Hide _Attachment Bar"
 msgstr "Скрыть панель _вложений"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2734
+#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
 msgid "Compose Message"
 msgstr "Новое сообщение"
 
-#: ../composer/e-msg-composer.c:4007
+#: ../composer/e-msg-composer.c:4056
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10546,8 +10903,7 @@ msgstr "Параметры отправки недоступны."
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr ""
-"Файл `{0}' не является обычным файлом и не может быть отправлен в сообщении."
+msgstr "Файл `{0}' не является обычным файлом и не может быть отправлен в сообщении."
 
 #: ../composer/mail-composer.error.xml.h:20
 msgid ""
@@ -10584,29 +10940,33 @@ msgstr "Внимание: Изменено сообщение"
 
 #: ../composer/mail-composer.error.xml.h:27
 msgid "You cannot attach the file `{0}' to this message."
-msgstr "Вы не можете вложить файл `{0}' в это сообщение."
+msgstr "Вы не можете вложить файл «{0}» в это сообщение. "
 
 #: ../composer/mail-composer.error.xml.h:28
 msgid "You need to configure an account before you can compose mail."
 msgstr "Перед созданием нового письма необходимо настроить учётную запись."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "П_родолжить редактирование"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_Не восстанавливать"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32 ../shell/main.c:306
 msgid "_Recover"
 msgstr "_Восстановить"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Сохранить сообщение"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "_Сохранить черновик"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Электронная почта и календарь Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Пакет для групповой работы"
 
@@ -10654,7 +11014,7 @@ msgstr "Название компонента для журнала"
 
 #: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
 #: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
-#: ../plugins/plugin-manager/plugin-manager.c:316
+#: ../plugins/plugin-manager/plugin-manager.c:339
 #: ../plugins/publish-calendar/publish-calendar.c:689
 msgid "Enabled"
 msgstr "Включено"
@@ -10663,17 +11023,16 @@ msgstr "Включено"
 msgid "Whether the plugin is enabled"
 msgstr "Включён ли модуль"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "Во время печати возникла ошибка"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "От системы печати получены следующие детали:"
 
-#: ../e-util/e-print.c:151
-msgid ""
-"The printing system did not report any additional details about the error."
+#: ../e-util/e-print.c:171
+msgid "The printing system did not report any additional details about the error."
 msgstr "Система печати не предоставила подробностей о причине ошибки."
 
 #: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
@@ -10900,56 +11259,56 @@ msgstr "Выберите файл"
 msgid "Test"
 msgstr "Проверка"
 
-#: ../filter/filter-rule.c:815
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "_Имя правила:"
 
-#: ../filter/filter-rule.c:843
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Найти элементы, которые соответствуют следующему критерию"
 
-#: ../filter/filter-rule.c:877
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "_Добавить правило фильтра"
 
-#: ../filter/filter-rule.c:883
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "Если удовлетворяет всем критериям"
 
-#: ../filter/filter-rule.c:883
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "Если удовлетворяет любому из критериев"
 
-#: ../filter/filter-rule.c:885
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Найти элементы:"
 
-#: ../filter/filter-rule.c:907
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Всё связанное"
 
-#: ../filter/filter-rule.c:907
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Ответы"
 
-#: ../filter/filter-rule.c:907
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Ответы и родительские"
 
-#: ../filter/filter-rule.c:907
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Не является ответом или родительским"
 
-#: ../filter/filter-rule.c:909
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "Включ_ая подшивки"
 
-#: ../filter/filter-rule.c:1005 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Входящие"
 
-#: ../filter/filter-rule.c:1005 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Исходящие"
 
@@ -11063,7 +11422,7 @@ msgstr "указанное вами время"
 
 #: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:399
+#: ../plugins/google-account-setup/google-source.c:404
 msgid "weeks"
 msgstr "недели"
 
@@ -11088,8 +11447,7 @@ msgid "Composer Preferences"
 msgstr "Настройка редактора"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Тут настраиваются параметры почты, включая безопасность и отображение "
 "сообщений"
@@ -11134,10 +11492,10 @@ msgstr "Настройка параметров почты Evolution"
 msgid "Evolution Network configuration control"
 msgstr "Настройка параметров сети Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:610
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
-#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
-#: ../mail/mail-component.c:757
+#: ../mail/mail-component.c:595 ../mail/mail-component.c:596
+#: ../mail/mail-component.c:760
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Почта"
@@ -11196,46 +11554,46 @@ msgstr "Запрашивать для каждого сообщения"
 msgid "Identity"
 msgstr "Подлинность"
 
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Получение почты"
 
-#: ../mail/em-account-editor.c:2041
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "Проверять _новую почту каждые"
 
-#: ../mail/em-account-editor.c:2049
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "мину_т"
 
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Отправка эл.почты"
 
-#: ../mail/em-account-editor.c:2282 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "По умолчанию"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:130
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
 #: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Безопасность"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2385 ../mail/em-account-editor.c:2476
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "Параметры получения"
 
-#: ../mail/em-account-editor.c:2386 ../mail/em-account-editor.c:2477
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "Проверка новой почты"
 
-#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Редактор учётных записей"
 
-#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Помощник по учётным записям Evolution"
 
@@ -11253,7 +11611,7 @@ msgid "Protocol"
 msgstr "Протокол"
 
 #: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1157 ../mail/mail-signature-editor.c:478
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "Без названия"
 
@@ -11269,18 +11627,18 @@ msgstr "Добавить скрипт подписи"
 msgid "Signature(s)"
 msgstr "Подпись(и)"
 
-#: ../mail/em-composer-utils.c:1008 ../mail/em-format-quote.c:413
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Пересланное сообщение --------"
 
-#: ../mail/em-composer-utils.c:1820
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "неизвестный отправитель"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1867
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11288,7 +11646,7 @@ msgstr ""
 "В ${AbbrevWeekdayName}, ${Day}/${Month}/${Year} в ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} пишет:"
 
-#: ../mail/em-composer-utils.c:2010
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-------- Исходное сообщение --------"
 
@@ -11309,10 +11667,6 @@ msgstr "Назначить цвет"
 msgid "Assign Score"
 msgstr "Назначить вес"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Вложения"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
@@ -11329,10 +11683,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "Завершено в"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "содержит"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Скопировать в папку"
@@ -11357,10 +11707,6 @@ msgstr "Удалить"
 msgid "Deleted"
 msgstr "Удалено"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "не содержит"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "не заканчивается на"
@@ -11381,10 +11727,6 @@ msgstr "не похоже на"
 msgid "does not start with"
 msgstr "не начинается с"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Не существует"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Черновик"
@@ -11393,10 +11735,6 @@ msgstr "Черновик"
 msgid "ends with"
 msgstr "заканчивается на"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Существует"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "существует"
@@ -11409,14 +11747,10 @@ msgstr "Выражение"
 msgid "Follow Up"
 msgstr "К исполнению"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1053
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Важное"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "является"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "после"
@@ -11429,18 +11763,6 @@ msgstr "до"
 msgid "is Flagged"
 msgstr "Отмечено"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "больше чем"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "меньше чем"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "не является"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "не отмечено"
@@ -11589,11 +11911,11 @@ msgid "Unset Status"
 msgstr "Сбросить состояние"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "Затем"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Добавить д_ействие"
 
@@ -11639,11 +11961,11 @@ msgstr "Важные"
 msgid "Messages Not Junk"
 msgstr "Не спам"
 
-#: ../mail/em-folder-browser.c:1147
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "Текущая учётная запись"
 
-#: ../mail/em-folder-browser.c:1200
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "Все учётные записи"
 
@@ -11668,7 +11990,16 @@ msgstr[2] "Всего сообщений:"
 msgid "Quota usage"
 msgstr "Квота"
 
-#: ../mail/em-folder-properties.c:385
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
+#: ../mail/mail-component.c:583
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:592
+msgid "Inbox"
+msgstr "Входящие"
+
+#: ../mail/em-folder-properties.c:386
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Свойства папки"
@@ -11685,8 +12016,9 @@ msgstr "С_оздать"
 msgid "Folder _name:"
 msgstr "_Имя папки:"
 
+#. load store to mail component at the end, when everything is loaded
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Папки поиска"
 
@@ -11695,124 +12027,89 @@ msgstr "Папки поиска"
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Черновики"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2540
-#: ../mail/mail-component.c:160
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:592
-msgid "Inbox"
-msgstr "Входящие"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "Исходящие"
 
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Отправленные"
 
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
-#. *
-#. * Most languages should translate this as "%s (%u)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:371
-#, c-format
-msgid "folder-display|%s (%u)"
-msgstr "%s (%u)"
-
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Дерево почтовых папок"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Перемещение папки %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Копирование папки %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1954
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Перемещение сообщений в папку %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1956
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копирование сообщений в папку %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Нельзя перетащить сообщение в хранилище верхнего уровня"
 
-#: ../mail/em-folder-tree.c:994 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Копировать в папку"
 
-#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "Переместить в папку"
 
-#: ../mail/em-folder-tree.c:1709 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканирование папок на «%s»"
 
-#: ../mail/em-folder-tree.c:2082 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "_Вид"
-
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Открыть в _новом окне"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2088
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "_Создать папку..."
 
-#: ../mail/em-folder-tree.c:2091
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "Пере_местить..."
 
-#: ../mail/em-folder-tree.c:2098 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "Пе_реименовать..."
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "Обнов_ить"
 
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "Отправить исход_ящие"
 
-#: ../mail/em-folder-tree.c:2106 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "О_чистить корзину"
 
@@ -11821,13 +12118,13 @@ msgstr "О_чистить корзину"
 msgid "Copying `%s' to `%s'"
 msgstr "Копирование `%s' в `%s'"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1191
-#: ../mail/em-folder-view.c:1206
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
+#: ../mail/em-folder-view.c:1208
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Выбрать папку"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1206
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
 msgid "C_opy"
 msgstr "_Копировать"
 
@@ -11849,168 +12146,168 @@ msgstr "Создать новую папку"
 msgid "Specify where to create the folder:"
 msgstr "Укажите, где создать папку:"
 
-#: ../mail/em-folder-view.c:1095 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Сбой удаления почты"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "У вас недостаточно прав для удаления этого сообщения."
 
-#: ../mail/em-folder-view.c:1334 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "О_тветить отправителю"
 
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:569 ../mail/em-popup.c:580
+#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "Пе_реслать"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1340 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1342 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Править как новое сообщение..."
 
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1348
 msgid "U_ndelete"
 msgstr "В_осстановить"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1349
 msgid "_Move to Folder..."
 msgstr "Переместить в папку..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1350
 msgid "_Copy to Folder..."
 msgstr "_Копировать в папку..."
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1353
 msgid "Mar_k as Read"
 msgstr "По_метить как прочитанные"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as _Unread"
 msgstr "Пометить как _непрочтенные"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Important"
 msgstr "Пометить как _важное"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as Un_important"
 msgstr "Пометить как нева_жное"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1357
 msgid "Mark as _Junk"
 msgstr "Пометить как _спам"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1358
 msgid "Mark as _Not Junk"
 msgstr "Пометить как _не спам"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1359
 msgid "Mark for Follo_w Up..."
 msgstr "Пометить к _исполнению..."
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1361
 msgid "_Label"
 msgstr "_Метка"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1360 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Нет"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1365
 msgid "_New Label"
 msgstr "_Новый ярлык"
 
-#: ../mail/em-folder-view.c:1367
+#: ../mail/em-folder-view.c:1369
 msgid "Fla_g Completed"
 msgstr "Отметка «_Завершено»"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1370
 msgid "Cl_ear Flag"
 msgstr "О_чистить отметку"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1373
 msgid "Crea_te Rule From Message"
 msgstr "Созда_ть правило из сообщения"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1375
 msgid "Search Folder based on _Subject"
 msgstr "Папка поиска по _теме"
 
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1376
 msgid "Search Folder based on Se_nder"
 msgstr "Папка поиска по _отправителю"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1377
 msgid "Search Folder based on _Recipients"
 msgstr "Папка поиска по _получателю"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1378
 msgid "Search Folder based on Mailing _List"
 msgstr "Папка поиска по списку _рассылки"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1381
+#: ../mail/em-folder-view.c:1383
 msgid "Filter based on Sub_ject"
 msgstr "Фильтр по _теме"
 
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1384
 msgid "Filter based on Sen_der"
 msgstr "Фильтр по _отправителю"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1385
 msgid "Filter based on Re_cipients"
 msgstr "Фильтр по _получателям"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1386
 msgid "Filter based on _Mailing List"
 msgstr "Фильтр по списку _рассылки"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2531
 msgid "Unable to retrieve message"
 msgstr "Не удалось получить сообщение"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2550
 msgid "Retrieving Message..."
 msgstr "Получение сообщения..."
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2809
 msgid "C_all To..."
 msgstr "Позвон_ить..."
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2812
 msgid "Create _Search Folder"
 msgstr "Создать папку поиска"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2813
 msgid "_From this Address"
 msgstr "_ этого адреса"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2814
 msgid "_To this Address"
 msgstr "_По этому адресу"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3311
 #, c-format
 msgid "Click to mail %s"
 msgstr "Нажмите, чтобы написать письмо %s"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3323
 #, c-format
 msgid "Click to call %s"
 msgstr "Нажмите, чтобы позвонить %s"
 
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3328
 msgid "Click to hide/unhide addresses"
 msgstr "Нажмите, чтобы показать/скрыть адреса"
 
@@ -12037,7 +12334,7 @@ msgstr "_Следующее"
 msgid "M_atch case"
 msgstr "_Учитывать регистр"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Не подписано"
 
@@ -12045,10 +12342,9 @@ msgstr "Не подписано"
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
-msgstr ""
-"Это сообщение не подписано. Отправитель не может быть аутентифицирован."
+msgstr "Это сообщение не подписано. Отправитель не может быть аутентифицирован."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Подпись действительна"
 
@@ -12060,7 +12356,7 @@ msgstr ""
 "Это сообщение подписано действительной подписью, что удостоверяет "
 "подлинность отправителя."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:649
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Подпись недействительна"
 
@@ -12072,7 +12368,7 @@ msgstr ""
 "Подпись этого сообщения не может быть проверена. Возможно, сообщение было "
 "изменено по дороге."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Подпись действительна, но проверить отправителя не удалось"
 
@@ -12084,7 +12380,7 @@ msgstr ""
 "Это сообщение подписано действительной подписью, но отправитель сообщения не "
 "может быть проверен."
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Подпись существует, но требуется публичный ключ"
 
@@ -12096,7 +12392,7 @@ msgstr ""
 "Это сообщение подписано действительной подписью, не не удалось найти "
 "соответствующий публичный ключ."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Не зашифровано"
 
@@ -12108,7 +12404,7 @@ msgstr ""
 "Это сообщение не зашифровано. Его содержимое может быть просмотрено в "
 "процессе передачи по Интернету."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Зашифровано, уязвимый шифр"
 
@@ -12122,7 +12418,7 @@ msgstr ""
 "Посторонние лица могут, хотя и с определёнными трудностями, получить доступ "
 "к содержимому письма за разумное время."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Зашифровано"
 
@@ -12134,7 +12430,7 @@ msgstr ""
 "Это сообщение зашифровано. Посторонним лицам будет очень сложно просмотреть "
 "содержимое этого сообщения."
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Зашифровано, стойкий шифр"
 
@@ -12243,84 +12539,84 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Страница %d из %d"
 
-#: ../mail/em-format-html.c:501 ../mail/em-format-html.c:510
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Получение «%s»"
 
-#: ../mail/em-format-html.c:922
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "Неизвестная часть external-body."
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "Часть external-body неверно сформирована"
 
-#: ../mail/em-format-html.c:960
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Указатель на FTP сайт (%s)"
 
-#: ../mail/em-format-html.c:971
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Указатель на локальный файл (%s), доступный на сайте «%s»"
 
-#: ../mail/em-format-html.c:973
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Указатель на локальный файл (%s)"
 
-#: ../mail/em-format-html.c:994
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Указатель на удалённые данные (%s)"
 
-#: ../mail/em-format-html.c:1005
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Указатель на неизвестные внешние данные (типа «%s»)"
 
-#: ../mail/em-format-html.c:1233
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "Форматирование сообщения"
 
-#: ../mail/em-format-html.c:1407
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "Форматирование сообщения..."
 
-#: ../mail/em-format-html.c:1560 ../mail/em-format-html.c:1624
-#: ../mail/em-format-html.c:1646 ../mail/em-format-quote.c:209
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Копия"
 
-#: ../mail/em-format-html.c:1561 ../mail/em-format-html.c:1630
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Скр.копия"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1741 ../mail/em-format-quote.c:350
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
 #: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Почтовый клиент"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1768
+#: ../mail/em-format-html.c:1771
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1773
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1904
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Это письмо было отослано <b>%s</b> от лица <b>%s</b>"
@@ -12351,43 +12647,43 @@ msgstr "Группы новостей"
 msgid "%s attachment"
 msgstr "вложение %s"
 
-#: ../mail/em-format.c:1197
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Не удалось разобрать сообщение S/MIME: Неизвестная ошибка"
 
-#: ../mail/em-format.c:1334 ../mail/em-format.c:1490
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Не удалось разобрать сообщение MIME. Отображается как есть."
 
-#: ../mail/em-format.c:1342
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Неподдерживаемый тип шифрования для multipart/encrypted"
 
-#: ../mail/em-format.c:1352
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "Не удалось разобрать сообщение PGP/MIME"
 
-#: ../mail/em-format.c:1352
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Не удалось разобрать сообщение PGP/MIME: Неизвестная ошибка"
 
-#: ../mail/em-format.c:1509
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "Неподдерживаемый формат подписи"
 
-#: ../mail/em-format.c:1517 ../mail/em-format.c:1588
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "Ошибка проверки подписи"
 
-#: ../mail/em-format.c:1517 ../mail/em-format.c:1579 ../mail/em-format.c:1588
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "Неизвестная ошибка при проверке подписи"
 
-#: ../mail/em-format.c:1660
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "Не удалось разобрать сообщение PGP."
 
-#: ../mail/em-format.c:1660
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Не удалось разобрать сообщение PGP: Неизвестная ошибка"
 
@@ -12440,8 +12736,7 @@ msgstr "Модуль %s доступен и соответствующий ис�
 #. May be a better text
 #: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
+msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "Модуль %s недоступен. Проверьте, что соответствующий пакет установлен."
 
 #: ../mail/em-mailer-prefs.c:1107
@@ -12449,69 +12744,84 @@ msgid "No Junk plugin available"
 msgstr "Модуль работы со спамом недоступен"
 
 #. green
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Выполнить"
 
 #. blue
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Позже"
 
-#: ../mail/em-migrate.c:1210
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Расположение и иерархия папок почтового ящика Evolution изменилась после "
-"Evolution 1.x.\n"
-"\n"
-"Подождите, пока Evolution преобразует ваши папки..."
+#: ../mail/em-migrate.c:1247
+#, c-format
+msgid "Migrating '%s':"
+msgstr "Преобразование «%s»:"
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Не удалось создать папку `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Не удалось скопировать дескриптор файла: `%s' в `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Не удалось сканировать имеющиеся почтовые ящики на `%s': %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:1868
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Расположение и иерархия папок почтового ящика Evolution изменилась после "
+"Evolution 1.x.\n"
+"\n"
+"Подождите, пока Evolution преобразует ваши папки..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Не удалось открыть сохраненные на сервере POP данные «%s»: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr ""
-"Не удалось создать каталог для хранения данных на сервере POP3 `%s': %s"
+msgstr "Не удалось создать каталог для хранения данных на сервере POP3 `%s': %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Не удалось скопировать сохраненные на сервере POP3 данные `%s': %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Ошибка создания локального хранилища почты`%s': %s"
 
-#: ../mail/em-migrate.c:2851
+#: ../mail/em-migrate.c:2898
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"После версии Evolution 2.24 форматом хранения сведений о папках почтовых ящиков стал sqlite.\n"
+"\n"
+"Подождите, пока Evolution преобразует ваши папки..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Не удалось создать локальные почтовые папки в `%s': %s"
 
-#: ../mail/em-migrate.c:2870
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12663,10 +12973,16 @@ msgstr ""
 "указанного в address_count."
 
 #: ../mail/evolution-mail.schemas.in.h:17
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr "Определяет, как часто локальны изменения синхронизируются с удалённым почтовым сервером. Интервал должен быть хотя бы 30 секунд."
+
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
 msgstr "Указанные пользователем заголовки для выявления спама"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -12674,59 +12990,59 @@ msgstr ""
 "Указанные пользователем заголовки для выявления спама. Формат в GConf: "
 "заголовок=значение."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Кодировка по умолчанию для составления сообщений"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Кодировка по умолчанию для составления сообщений."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Кодировка по умолчанию для отображения сообщений"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Кодировка по умолчанию для отображения сообщений."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Стиль пересылки по умолчанию"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Высота окна редактора по умолчанию."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Высота окна сообщения по умолчанию."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Высота диалога подписки по умолчанию."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Стиль ответа по умолчанию"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Состояние подшивки по умолчанию"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Ширина окна редактора по умолчанию."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Ширина окна сообщения по умолчанию."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Ширина окна подписки по умолчанию."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
 "Determines whether to look up addresses for junk filtering in local "
 "addressbook only"
@@ -12734,11 +13050,11 @@ msgstr ""
 "Определяет, нужно ли искать адреса для фильтрации спама только в локальной "
 "адресной книге"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr "Определяет, нужно ли искать отправителя в адресной книге"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12751,13 +13067,13 @@ msgstr ""
 "быть медленным, если для автозавершения помечены удалённые книги (например, "
 "LDAP)."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Определяет, надо ли использовать указанные пользователем заголовки для "
 "выявления спама"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12767,7 +13083,7 @@ msgstr ""
 "выявления спама. Если этот ключ установлен и заголовки указаны, то скорость "
 "проверки на спам повысится."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -12775,60 +13091,59 @@ msgstr ""
 "Определяет, надо ли использовать одинаковые шрифты для строк «От» и «Тема» в "
 "столбце «Сообщения» в вертикальном режиме просмотра."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Каталог для сохранения файлов компонентов почты."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Каталог для сохранения файлов компонентов почты."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
 msgstr "Включить или выключить сокращение имён папок в дереве"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Подчеркивать ошибки орфографии при вводе текста"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Очищать каталог спама при выходе"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Очищать корзину при выходе"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Очищать все каталоги со спамом при выходе из Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Очищать все корзины при выходе из Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
-"Включить режим каретки, то есть вы сможете видеть курсор при чтении почты."
+msgstr "Включить режим каретки, то есть вы сможете видеть курсор при чтении почты."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Включить или выключить «волшебный пробел»"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Enable or disable type ahead search feature"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Включить папки поиска"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Включить папки поиска при запуске."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12840,7 +13155,7 @@ msgstr ""
 "который можно произвести, просто набрав имя папки. Выделение будет "
 "автоматически перемещено к нужной папке."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12848,28 +13163,27 @@ msgstr ""
 "Установите этот ключ, чтобы можно было использовать клавишу пробела для "
 "прокрутки предпросмотра сообщения, списка сообщений и папок."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "Разрешить рендеринг текстовой части сообщения ограниченного размера"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Включить/выключить режим каретки"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Высота панели списка сообщений"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Высота панели спика сообщений."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
-msgstr ""
-"Скрыть предварительный просмотр для каждого каталога и удалить выделение"
+msgstr "Скрыть предварительный просмотр для каждого каталога и удалить выделение"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12877,7 +13191,7 @@ msgstr ""
 "Если пользователь пытается открыть 10 или более сообщений одновременно, "
 "выводить диалог запроса, действительно ли пользователь хочет это сделать."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12885,7 +13199,7 @@ msgstr ""
 "Если включен предварительный просмотр сообщений, отображать его сбоку, а не "
 "под списком сообщений."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12896,7 +13210,7 @@ msgstr ""
 "компонентом просмотра bonobo среды Гном, могут использоваться для "
 "отображения содержимого."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -12904,7 +13218,7 @@ msgstr ""
 "Исходное значение высоты окна «Отправка и получение почты». Это значение "
 "изменяется, когда пользователь изменяет размер окна по вертикали."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -12918,7 +13232,7 @@ msgstr ""
 "окно «Отправка и получение почты» не может быть развёрнуто на весь экран. "
 "Этот ключ существует только из-за деталей реализации."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -12926,12 +13240,11 @@ msgstr ""
 "Исходное значение ширины окна «Отправка и получение почты». Это значение "
 "изменяется, когда пользователь изменяет размер окна по горизонтали."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
-msgstr ""
-"Включает/выключает запрос подтверждения при пометке нескольких сообщений."
+msgstr "Включает/выключает запрос подтверждения при пометке нескольких сообщений."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -12939,7 +13252,7 @@ msgstr ""
 "Включает/выключает повторяющиеся запросы о том, надо ли синхронизировать "
 "перед переходом в автономный режим."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -12949,31 +13262,31 @@ msgstr ""
 "сообщений из папки поиска они удаляются совсем, а не только из результатов "
 "поиска."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "Время последней очистки спама"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "Время последней очистки корзины"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Уровень, за которым сообщение должно заноситься в журнал."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Список ярлыков и связанных с ними цветов"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Список принятых лицензий"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Список учётных записей"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12982,15 +13295,15 @@ msgstr ""
 "список содержит строки, соответствующие именам каталогов в /apps/evolution/"
 "mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "Список дополнительных заголовков и включены ли они."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Список языков, используемый для проверки орфографии."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12998,271 +13311,271 @@ msgstr ""
 "Список ярлыков, известных почтовому компоненту Evolution. Список содержит "
 "строки имя:цвет, где цвет использует кодировку цвета HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Список типов mime для подбора программы просмотра через bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Список имен протоколов, чьи лицензии были приняты."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Загружать сообщения для HTML-сообщений по http"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net. 1 - Load images in messages from contacts. 2 - "
-"Always load images off the net."
+"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
 msgstr ""
-"Загружать изображения для HTML-сообщений по http(s). Возможные значения: 0 — "
-"никогда не загружать изображения из сети; 1 — загружать изображения, если "
-"отправитель есть в адресной книге; 2 — всегда загружать изображения из сети."
+"Загружать изображения для HTML-сообщений по http(s). Возможные значения: «0»"
+" — никогда не загружать изображения из сети; «1» — загружать изображения, если "
+"отправитель есть в адресной книге; «2» — всегда загружать изображения из сети."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Регистрировать действия фильтра"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Регистрировать действия фильтра в указанном файле журнала."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Файл журнала действий фильтра"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Файл журнала действий фильтра."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Помечать как просмотренные через указанное время"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Помечать сообщение как просмотренное через указанный период времени."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Помечать цитирование в сообщении в панели предварительного просмотра"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Помечать цитирование в сообщении в панели предварительного просмотра."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Высота окна сообщения по умолчанию"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Ширина окна сообщения по умолчанию"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Тип отображения сообщения («normal», «full headers», «source»)"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Минимальное количество дней между очисткой спама при выходе"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Минимальное количество дней между очисткой корзины при выходе"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Минимальное время между очисткой спама при выходе, в днях."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Минимальное время между очисткой корзины при выходе, в днях."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Количество адресов, отображаемых в TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Предупреждать, если тема пустая"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Предупреждать, если пользователь пытается очистить удалённые сообщения в "
 "папке."
 
-#: ../mail/evolution-mail.schemas.in.h:99
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:100
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Предупреждать, если пользователь пытается отправить сообщение с пустым полем "
 "Subject."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Предупреждать о немедленном выходе в автономный режим"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "Предупреждать при удалении сообщений в папке поиска"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Предупреждать при очистке пользователем"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Предупреждать, если пользователь заполнил только поле Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Выводить запрос при попытке пользователя открыть 10 или более сообщений "
 "одновременно"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
-msgstr ""
-"Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого."
+msgstr "Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-"Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
+msgstr "Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-"Предупреждать, когда пользователь пытается отправить нежелательный HTML"
+msgstr "Предупреждать, когда пользователь пытается отправить нежелательный HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Предупреждать при пометке нескольких сообщений"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Распознавать эмоции в тексте и заменять их значками."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Распознавать ссылки в тексте и заменять их."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Проверять на спам входящую почту."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Сохранить каталог"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Search for the sender photo in local addressbooks"
 msgstr "Искать фотографии отправителя в локальных адресных книгах"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Отправлять почту в формате HTML по умолчанию"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Отправлять почту в формате HTML по умолчанию."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "Показывать адрес отправителя в столбце списка сообщений"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "Интервал синхронизации с сервером"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Показывать анимацию"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Показывать анимированные изображения как анимации."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Показывать удалённые сообщения (как перечеркнутые) в списке сообщений."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Показывать удалённые сообщения в списке сообщений"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Показать фотографию отправителя"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Показывать адрес отправителя в отдельном столбце списка сообщений."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Показывать фотографию отправителя в панели чтения сообщений."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Проверять орфографию при вводе"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Spell checking color"
 msgstr "Цвет проверки орфографии"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell checking languages"
 msgstr "Языки проверки орфографии"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Высота диалога подписки по умолчанию"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Ширина окна диалога подписки по умолчанию"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Шрифт терминала"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Ограничение размера текстового вложения"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "Модуль, обрабатывающий спам по умолчанию"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "Время последней очистки спама, в днях с начала эпохи."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Время последней очистки корзины, в днях с начала эпохи."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "Шрифт терминала для отображения почты."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "Пропорциональный шрифт для основного дисплея."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
 "У этого ключа может быть одно из трёх значений: 0 — ошибки, 1 — "
 "предупреждения; 2 — отладочные сообщения."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -13271,7 +13584,7 @@ msgstr ""
 "отформатировано в программе Evolution. Размер по умолчанию 4MB / 4096 KB и "
 "указывается в КБ."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13281,16 +13594,16 @@ msgstr ""
 "обработки спама включены одновременно. Если модуль по умолчанию выключен, "
 "доступные модули обработки спама всё равно не будут использоваться."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid ""
-"This key is read only once and reset to false after read. This unselects the "
-"mail in the list and removes the preview for that folder."
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
 msgstr ""
 "Этот ключ читается только один раз и сбрасывается в ложь после чтения. С "
 "помощью него можно отменить выделение почты и отключить панель просмотра "
 "текущего каталога."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13302,7 +13615,7 @@ msgstr ""
 "enabled&gt; - установить включенным, если заголовок должен отображаться в "
 "окне просмотра почты."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local addressbook only to exclude "
@@ -13312,11 +13625,11 @@ msgstr ""
 "использовать ли только локальные адресные книги при исключении известных "
 "контактов при фильтрации спама."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "Этот параметр должен увеличить скорость загрузки."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13324,7 +13637,7 @@ msgstr ""
 "Устанавливает количество адресов, отображаемых при просмотре сообщения, за "
 "которыми отображается «...»."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13333,7 +13646,7 @@ msgstr ""
 "свёрнутой. Чтобы изменение этого ключа вступило в силу, надо перезапустить "
 "Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13343,32 +13656,18 @@ msgstr ""
 "сообщению в каждой подшивке, а не по дате сообщения. Чтобы изменение этого "
 "ключа вступило в силу, надо перезапустить Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Подшивать список сообщений."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Подшивать список сообщений"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Подшивать список сообщений по полю «Тема»"
 
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "Time interval, in seconds, how often upload store changes to server."
-msgstr ""
-"Временной интервал в секундах, содержащий частоту сохранения изменений на "
-"сервере."
-
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid ""
-"Time interval, in seconds, how often upload store changes to server. The "
-"actual value cannot be less than 30 seconds."
-msgstr ""
-"Временной интервал в секундах, содержащий частоту сохранения изменений на "
-"сервере. Значение не может быть меньше 30 секунд."
-
 #: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Задержка перед помечанием сообщения как просмотренное"
@@ -13563,7 +13862,13 @@ msgstr "список рассылки %s"
 msgid "Add Filter Rule"
 msgstr "Добавить правило фильтра"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "Шаблоны"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -13571,7 +13876,7 @@ msgstr[0] "выделено %d, "
 msgstr[1] "выделено %d, "
 msgstr[2] "выделено %d, "
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -13579,7 +13884,7 @@ msgstr[0] "%d удаленное"
 msgstr[1] "%d удаленных"
 msgstr[2] "%d удаленных"
 
-#: ../mail/mail-component.c:558
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -13587,7 +13892,7 @@ msgstr[0] "%d спам"
 msgstr[1] "%d спам"
 msgstr[2] "%d спам"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -13595,7 +13900,7 @@ msgstr[0] "%d черновиков"
 msgstr[1] "%d черновика"
 msgstr[2] "%d черновиков"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -13603,7 +13908,7 @@ msgstr[0] "%d отправленное"
 msgstr[1] "%d отправленных"
 msgstr[2] "%d отправленных"
 
-#: ../mail/mail-component.c:565
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -13611,7 +13916,7 @@ msgstr[0] "%d неотправленное"
 msgstr[1] "%d неотправленных"
 msgstr[2] "%d неотправленных"
 
-#: ../mail/mail-component.c:571
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -13619,7 +13924,7 @@ msgstr[0] "%d непрочитанное"
 msgstr[1] "%d непрочитанных"
 msgstr[2] "%d непрочитанных"
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -13627,86 +13932,78 @@ msgstr[0] "%d всего"
 msgstr[1] "%d всего"
 msgstr[2] "%d всего"
 
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:916
 msgid "New Mail Message"
 msgstr "Новое почтовое сообщение"
 
-#: ../mail/mail-component.c:914
-msgid "_Mail Message"
-msgstr "_Почтовое сообщение"
-
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:918
 msgid "Compose a new mail message"
 msgstr "Создать новое сообщение"
 
-#: ../mail/mail-component.c:921
+#: ../mail/mail-component.c:924
 msgid "New Mail Folder"
 msgstr "Новая почтовая папка"
 
-#: ../mail/mail-component.c:922
-msgid "Mail _Folder"
-msgstr "По_чтовая папка"
-
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:926
 msgid "Create a new mail folder"
 msgstr "Создать новую почтовую папку"
 
-#: ../mail/mail-component.c:1070
+#: ../mail/mail-component.c:1073
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Ошибка обновления параметров почты или папок."
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1586
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1586
 msgid "Errors"
 msgstr "Ошибки"
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1587
 msgid "Warnings and Errors"
 msgstr "Предупреждения и ошибки"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1588
 msgid "Debug"
 msgstr "Отладка"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1588
 msgid "Error, Warnings and Debug messages"
 msgstr "Ошибки, предупреждения и отладочные сообщения"
 
-#: ../mail/mail-component.c:1712
+#: ../mail/mail-component.c:1715
 msgid "Debug Logs"
 msgstr "Журналы отладки"
 
-#: ../mail/mail-component.c:1726
+#: ../mail/mail-component.c:1729
 msgid "Show _errors in the status bar for"
 msgstr "Показывать о_шибки в строке состояния для"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1742
+#: ../mail/mail-component.c:1745
 msgid "second(s)."
 msgstr "секунд."
 
-#: ../mail/mail-component.c:1748
+#: ../mail/mail-component.c:1751
 msgid "Log Messages:"
 msgstr "Сообщения журнала:"
 
-#: ../mail/mail-component.c:1789
+#: ../mail/mail-component.c:1792
 msgid "Log Level"
 msgstr "Уровень журналирования"
 
-#: ../mail/mail-component.c:1798 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Время"
 
-#: ../mail/mail-component.c:1808 ../mail/message-list.c:2386
+#: ../mail/mail-component.c:1811 ../mail/message-list.c:2430
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Сообщения"
 
-#: ../mail/mail-component.c:1817 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Закрыть это окно"
@@ -13959,15 +14256,14 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Подписывать исходящие сообщения (по умолчанию)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgid "Do not format messages when text si_ze exceeds"
 msgstr ""
 "Не форматировать текстовое содержимое в сообщениях, если размер текста "
 "превышает"
 
 #: ../mail/mail-config.glade.h:72
 msgid "Do not mar_k messages as junk if sender is in my addressbook"
-msgstr ""
-"Не поме_чать сообщения как спам, если отправитель есть в моей адресной книге"
+msgstr "Не поме_чать сообщения как спам, если отправитель есть в моей адресной книге"
 
 #: ../mail/mail-config.glade.h:73
 msgid "Do not quote"
@@ -14086,8 +14382,7 @@ msgid "No _Proxy for:"
 msgstr "Не использовать _прокси для:"
 
 #: ../mail/mail-config.glade.h:107
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 "Примечание: Символ подчёркивания в надписи используется как обозначение "
 "мнемоники в меню."
@@ -14101,18 +14396,24 @@ msgstr ""
 "серверу"
 
 #: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+"Этот параметр будет игнорироваться, в случае совпадения с "
+"указанных пользователем заголовков для выявления спама."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "О_рганизация:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "Идентификатор ключа PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "_Пароль:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -14120,7 +14421,7 @@ msgstr ""
 "Введите имя, описывающее эту учётную запись.\n"
 "Это имя будет использоваться только на экране."
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14128,7 +14429,7 @@ msgstr ""
 "Введите информацию о способе отправки электронной почты. Если вы не уверены, "
 "свяжитесь со своим системным администратором или поставщиком услуг Интернета."
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14138,117 +14439,117 @@ msgstr ""
 "обязательны для заполнения, если только вы не хотите включать эти сведения в "
 "отправляемую вами почту."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Выберите один из следующих вариантов"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
 msgstr "_Порт:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Пр_едупреждать при отправке сообщений, в которых определены только "
 "получатели скрытой копии."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Процитировано"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "За_помнить пароль"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "_Обратный адрес:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Запомнить _пароль"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
 msgstr "Узел S_OCKS:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "И_скать фотографию отправителя в локальных адресных книгах"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "В_ыбрать..."
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "О_тправлять отчёты:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "С_тандартный шрифт:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Выбрать шрифт HTML фиксированной ширины"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Выбрать шрифт HTML фиксированной ширины для печати"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Выбрать шрифт HTML переменной ширины"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Выбрать шрифт HTML переменной ширины для печати"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Отправка почты"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Папка _отправленных сообщений:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "Т_ребуется проверка подлинности"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_Тип сервера: "
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Се_ртификат подписи:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "Подп_ись:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Подписи"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Таблица подписей"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Проверка орфографии"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
 msgid "Start _typing at the bottom on replying"
 msgstr "При ответе начинать _ввод после цитаты"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "_Тип: "
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14256,7 +14557,7 @@ msgstr ""
 "Этот список языков перечисляет только те языки, для которых у вас "
 "установлены словари."
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14266,13 +14567,6 @@ msgstr ""
 "в качестве вашей подписи. Имя, указанное вами,\n"
 "будет использоваться только для отображения. "
 
-#: ../mail/mail-config.glade.h:151
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"Этот параметр будет переопределён, если будет найдено совпадение для "
-"указанных пользователем заголовков для выявления спама."
-
 #: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -14290,7 +14584,7 @@ msgid "Use Authe_ntication"
 msgstr "Использовать аутентифик_ацию"
 
 #: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:359
+#: ../plugins/google-account-setup/google-source.c:364
 msgid "User_name:"
 msgstr "_Имя пользователя:"
 
@@ -14366,12 +14660,11 @@ msgstr "_Никогда не загружать изображения из Ин
 
 #: ../mail/mail-config.glade.h:177
 msgid "_Path:"
-msgstr "Путь:"
+msgstr "_Путь:"
 
 #: ../mail/mail-config.glade.h:178
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr ""
-"П_редупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "П_редупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
 
 #: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
@@ -14466,43 +14759,43 @@ msgstr "Учитывать _регистр"
 msgid "Co_mpleted"
 msgstr "_Завершено"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "_Найти:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Поиск в сообщении"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
 msgid "Flag to Follow Up"
 msgstr "Пометить к исполнению"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Подписка на папки"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Лицензионное соглашение"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Ничего не выбрано"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "С_ервер:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Сведения о безопасности"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Указанные папки"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14510,19 +14803,19 @@ msgstr ""
 "Сообщения, помеченные вами к исполнению, перечислены ниже.\n"
 "Выберите действие из меню «Отметка»."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Принять лицензию"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Срок до:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Отметка:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "Установите, чтобы принять лицензионное соглашение"
 
@@ -14667,10 +14960,10 @@ msgstr[2] "Получение %d сообщений"
 #: ../mail/mail-ops.c:1978
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
-msgstr[0] "Подписывается %d сообщение"
-msgstr[1] "Подписывается %d сообщения"
-msgstr[2] "Подписывается %d сообщений"
+msgid_plural "Saving %d messages"
+msgstr[0] "Сохранение %d сообщения"
+msgstr[1] "Сохранение %d сообщений"
+msgstr[2] "Сохранение %d сообщений"
 
 #: ../mail/mail-ops.c:2056
 #, c-format
@@ -14770,11 +15063,6 @@ msgstr "Операция отменена пользователем."
 msgid "_Save and Close"
 msgstr "Со_хранить и закрыть"
 
-#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_Файл"
-
 #: ../mail/mail-signature-editor.c:355
 msgid "Edit Signature"
 msgstr "Редактировать подписи"
@@ -14822,11 +15110,11 @@ msgstr "Обновление папок поиска для '%s:%s'"
 msgid "Updating Search Folders for '%s'"
 msgstr "Обновление папок писка для «%s»"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Изменить папку поиска"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Новая папка поиска"
 
@@ -14854,9 +15142,7 @@ msgstr ""
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
-msgstr ""
-"Было запрошено уведомление о прочтении для «{1}». Отправить уведомление к "
-"{0}?"
+msgstr "Было запрошено уведомление о прочтении для «{1}». Отправить уведомление к {0}?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
@@ -14881,8 +15167,7 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Вы действительно хотите удалить эту учётную запись?"
 
 #: ../mail/mail.error.xml.h:11
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Вы действительно хотите удалить эту учётную запись и все её прокси?"
 
 #: ../mail/mail.error.xml.h:12
@@ -14911,8 +15196,7 @@ msgstr "Вы действительно хотите отправить сооб
 
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr ""
-"Вы действительно хотите отправить сообщение получателям только слепой копии?"
+msgstr "Вы действительно хотите отправить сообщение получателям только слепой копии?"
 
 #: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
@@ -14960,8 +15244,7 @@ msgstr "Не удалось удалить системную папку «{0}»
 
 #: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr ""
-"Не удалось изменить папку поиска «{0}», потому что такая папка не существует."
+msgstr "Не удалось изменить папку поиска «{0}», потому что такая папка не существует."
 
 #: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
@@ -15127,8 +15410,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
-"Если вы продолжите, сведения о учётной записи будут безвозвратно удалены."
+msgstr "Если вы продолжите, сведения о учётной записи будут безвозвратно удалены."
 
 #: ../mail/mail.error.xml.h:67
 msgid ""
@@ -15186,8 +15468,7 @@ msgstr "Проверьте параметры вашей учётной запи
 
 #: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
-msgstr ""
-"Включите учётную запись или используйте для отправки другую учётную запись."
+msgstr "Включите учётную запись или используйте для отправки другую учётную запись."
 
 #: ../mail/mail.error.xml.h:80
 msgid ""
@@ -15339,10 +15620,8 @@ msgstr ""
 "отключена"
 
 #: ../mail/mail.error.xml.h:115
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
-msgstr ""
-"Сообщение не может быть отправлено, потому что не указан ни один получатель"
+msgid "This message cannot be sent because you have not specified any recipients"
+msgstr "Сообщение не может быть отправлено, потому что не указан ни один получатель"
 
 #: ../mail/mail.error.xml.h:116
 msgid ""
@@ -15453,78 +15732,79 @@ msgstr "Уни_чтожить удалённые"
 msgid "_Open Messages"
 msgstr "_Открыть сообщения"
 
-#: ../mail/message-list.c:1050
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Непрочитано"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Прочитано"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Отвечено"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Переслано"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Множество непрочитанных сообщений"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Множество сообщений"
 
-#: ../mail/message-list.c:1059
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Самый низкий"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Низкий"
 
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Высокий"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Самый высокий"
 
-#: ../mail/message-list.c:1594 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1601 ../plugins/itip-formatter/itip-view.c:204
+#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Сегодня %I:%M %p"
 
-#: ../mail/message-list.c:1610 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: ../mail/message-list.c:1622 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:3831
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3885 ../mail/message-list.c:4321
 msgid "Generating message list"
 msgstr "Создание списка сообщений"
 
-#: ../mail/message-list.c:4106
+#: ../mail/message-list.c:4176
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15532,7 +15812,7 @@ msgstr ""
 "Нет писем, удовлетворяющих критериям поиска. Очистите поле поиска с помощью "
 "меню Поиск → Очистить или измените критерии."
 
-#: ../mail/message-list.c:4108
+#: ../mail/message-list.c:4178
 msgid "There are no messages in this folder."
 msgstr "В папке нет сообщений."
 
@@ -15650,6 +15930,7 @@ msgstr ""
 "теле письма."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Ключевые слова"
 
@@ -15736,84 +16017,107 @@ msgstr "Выберите архив Evolution для восстановлени�
 msgid "Choose a file to restore"
 msgstr "Выберите файл для восстановления"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "Сохранить каталог Evolution"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "Восстановить каталог Evolution"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "Проверить архив Evolution"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "Перезапустить Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr "С графическим интерфейсом"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:105
+#: ../plugins/backup-restore/backup.c:238
 msgid "Shutting down Evolution"
 msgstr "Останавливается Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "Сохранение и восстановление данных и параметров Evolution"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr ""
-"Сохранение данных Evolution (писем, контактов, календарей, задач, заметок)"
+msgstr "Сохранение данных Evolution (писем, контактов, календарей, задач, заметок)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "Архив создан"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:319
 msgid "Restarting Evolution"
 msgstr "Перезапуск Evolution"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "Сохранение текущих данных Evolution"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "Восстановление из архива"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "Загрузка настроек Evolution"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "Удаление временных файлов архивации"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr "Проверка локальных источников"
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Архивация данных в каталог %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Восстановление из каталога %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Backup"
 msgstr "Архив Evolution"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "Восстановление Evolution"
 
+#: ../plugins/backup-restore/backup.c:494
+msgid "Backing up Evolution Data"
+msgstr "Резервное копирование данных Evolution"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Подождите, пока Evolution выполняет резервное копирование ваших данных."
+
+#: ../plugins/backup-restore/backup.c:497
+msgid "Restoring Evolution Data"
+msgstr "Восстановление данных Evolution"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Подождите, пока Evolution восстанавливает ваши данные."
+
+#: ../plugins/backup-restore/backup.c:516
+msgid "This may take a while depending on the amount of data in your account."
+msgstr "Это может занять некоторое время, в завимости от объема данных вашей учетной записи."
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr "Модуль для сохранения и восстановление данных и параметров Evolution."
@@ -15828,10 +16132,8 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "Вы действительно хотите закрыть Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr ""
-"Вы действительно хотите восстановить Evolution из выбранного файла архива?"
+msgid "Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "Вы действительно хотите восстановить Evolution из выбранного файла архива?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid ""
@@ -15857,8 +16159,8 @@ msgid "Please select a valid backup file to restore."
 msgstr "Выберите архив Evolution для восстановления"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "The selected folder does not have enough permissions to create the file"
-msgstr "Недостаточно прав доступа для создания файла в выделенном каталоге."
+msgid "The selected folder is not writable."
+msgstr "Выделенная папка недоступна для записи."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
@@ -15893,10 +16195,8 @@ msgstr "Автоматические контакты"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
-msgstr ""
-"_Автоматически создавать записи в адресной книге при ответе на сообщения"
+msgid "_Auto-create addressbook entries when replying to messages"
+msgstr "_Автоматически создавать записи в адресной книге при ответе на сообщения"
 
 #: ../plugins/bbdb/bbdb.c:571
 msgid "Select Address book for Automatic Contacts"
@@ -15908,11 +16208,9 @@ msgstr "Контакты мгновенных сообщений"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
-"Периодически синхронизирует контактную информацию и изображения из списка "
+"Синхронизирует контактную информацию и изображения из списка "
 "контактов Pidgin"
 
 #: ../plugins/bbdb/bbdb.c:607
@@ -15997,7 +16295,7 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:352
+#: ../plugins/google-account-setup/google-source.c:357
 msgid "Use _SSL"
 msgstr "Использовать _SSL"
 
@@ -16019,7 +16317,7 @@ msgstr "Предоставляет базовую функциональност
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:376
+#: ../plugins/google-account-setup/google-source.c:381
 msgid "Re_fresh:"
 msgstr "Обнов_ить"
 
@@ -16109,16 +16407,14 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Проверять, является ли Evolution почтовой программой по умолчанию"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Проверять при каждом запуске, является ли Evolution почтовой программой по "
 "умолчанию."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
-msgstr ""
-"Проверяет при запуске, является ли Evolution почтовым клиентом по умолчанию."
+msgstr "Проверяет при запуске, является ли Evolution почтовым клиентом по умолчанию."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
@@ -16161,10 +16457,28 @@ msgstr ""
 "Предоставляет функциональность для установки календаря или адресной книги "
 "как используемых по умолчанию."
 
-#: ../plugins/email-custom-header/email-custom-header.c:535
+#: ../plugins/email-custom-header/email-custom-header.c:562
 msgid "_Custom Header"
 msgstr "_Дополнительные заголовки"
 
+#: ../plugins/email-custom-header/email-custom-header.c:883
+msgid "Key"
+msgstr "Ключ"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Значения"
+
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+"Формат определения дополнительного заголовка:\n"
+"Имена значений ключа дополнительных заголовков разделяются знаком «;»."
+
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
 msgid "Email Custom Header"
 msgstr "Дополнительные заголовки сообщений"
@@ -16179,7 +16493,7 @@ msgid "Custom Header"
 msgstr "Дополнительные заголовки"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Header"
+msgid "List of Custom Headers"
 msgstr "Список дополнительных заголовков"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
@@ -16295,29 +16609,33 @@ msgstr "Размер папок"
 msgid "Exchange Settings"
 msgstr "Параметры Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:623
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:649
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "А_утентификация"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:852
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "_Почтовый ящик:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "Тип _аутентификации"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:866
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "Пров_ерить поддерживаемые типы"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:978
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s КБ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -16539,7 +16857,7 @@ msgstr "Размер папки"
 msgid "User"
 msgstr "Пользователь"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Подписка на папку другого пользователя"
@@ -16804,8 +17122,8 @@ msgid ""
 "Changes to options for Exchange account \"{0}\" will only take effect after "
 "restarting Evolution."
 msgstr ""
-"Изменения настройки учётной записи Exchange «{0}» вступят в силу только "
-"после перезапуска Evolution."
+"Изменения настройки учётной записи Exchange «{0}» вступят в силу только после "
+"перезапуска Evolution."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not authenticate to server."
@@ -16871,10 +17189,14 @@ msgid "Could not update out-of-office state"
 msgstr "Не удалось обновить состояние «не на работе»"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr "Для загрузки подписанного почтового ящика пользователя требуется перезапуск Evolution"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "Учётная запись Exchange отключена."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16902,32 +17224,32 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Ошибка обновления представителей:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Папка уже существует"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Папка не существует"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Папка отключена"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 #: ../shell/e-shell.c:1286
 msgid "Generic error"
 msgstr "Общая ошибка"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "Сервер глобального каталога недоступен"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -16935,73 +17257,73 @@ msgstr ""
 "Если OWA выполняется по другому пути, вы должны указать это в диалоге "
 "настройки учётной записи."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "Почтовый ящик для {0} находится не на этом сервере."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "Убедитесь, что URL верен, и попробуйте еще раз."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "Убедитесь, что имя сервера введено корректно, и попробуйте еще раз."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr "Убедитесь, что имя пользователя и пароль верны, и попробуйте еще раз."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "Для этой учётной записи не настроен сервер Глобального каталога."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "Нет почтовых ящиков для пользователя {0} на {1}."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Нет такого пользователя {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "Пароль успешно изменен."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 "Введите идентификатор представителя или уберите параметр отсылки сообщения "
 "как сообщения представителя."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Убедитесь, что имя сервера глобального каталога корректно."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Перезапустите Evolution, чтобы изменения вступили в силу"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Выберите пользователя."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "Сервер отверг пароль, потому что он слишком уязвим."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Учётная запись Exchange запрещена, когда вы выйдете из Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Учётная запись Exchange будет удалена, когда вы выйдете из Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Сервер Exchange несовместим с Exchange Connector."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17009,7 +17331,7 @@ msgstr ""
 "На этом сервере работает Exchange 5.5. Exchange Connector\n"
 " поддерживает только Microsoft Exchange 2000 и 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17022,57 +17344,57 @@ msgstr ""
 "\n"
 "Или же вы просто неправильно ввели пароль."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "Попробуйте еще раз с другим паролем."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "Не удалось добавить пользователя в список управления доступом:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Не удалось изменить представителей."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Неизвестная ошибка при поиске {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown error."
 msgstr "Неизвестная ошибка."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Неизвестный тип"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Неподдерживаемое действие"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "Вы почти достигли квоты сохранения сообщений на этом сервере."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr "Вам разрешено посылать сообщение только от имени одного пользователя."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "Вы не можете сделать себя своим представителем"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Вы превысили квоту для сохранения сообщений на этом сервере."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "Вы можете настроить только одну учётную запись Exchange."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -17080,7 +17402,7 @@ msgstr ""
 "Сейчас вы используете: {0}KB. Попробуйте очистить место, удалив некоторое "
 "количество сообщений."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -17088,7 +17410,7 @@ msgstr ""
 "Сейчас вы используете: {0}KB. Вы не сможете ни отправлять, ни получать "
 "сообщения."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17096,19 +17418,19 @@ msgstr ""
 "Сейчас вы используете: {0}KB. Вы не сможете отправлять сообщения, пока не "
 "очистите место путем удаления некоторого количества сообщений."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "Срок действия вашего пароля истёк."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} не может быть добавлен в список управления доступом"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} уже является представителем"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} уже в списке"
 
@@ -17166,8 +17488,8 @@ msgstr ""
 "задать другой редактор."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "Составлять сообщения во внешнем редакторе"
+msgid "Compose in _External Editor"
+msgstr "Составлять сообщения _во внешнем редакторе"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
@@ -17219,8 +17541,7 @@ msgstr "Отмена подписки на папку «%s»"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
 msgid "Allows unsubscribing of mail folders in the folder tree context menu."
-msgstr ""
-"Позволяет отменять подписку на почтовые папки в контекстном меню папки."
+msgstr "Позволяет отменять подписку на почтовые папки в контекстном меню папки."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -17228,16 +17549,33 @@ msgstr "Отписка от папок"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
-msgstr "Отказаться от подписки"
+msgstr "_Отказаться от подписки"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:73
+#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "Google"
 
+#: ../plugins/google-account-setup/google-contacts-source.c:198
+msgid "<b>Server</b>"
+msgstr "<b>Сервер</b>"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:208
+msgid "Username:"
+msgstr "Имя пользователя:"
+
+#. Translators: This is the first half of the sentence "Update
+#. * every NNN minute(s)", where NNN is a spin button widget.
+#: ../plugins/google-account-setup/google-contacts-source.c:233
+msgid "Update every"
+msgstr "Обновлять каждые"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "Модуль для настройки календаря google."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "Модуль для настройки календаря и контактов google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
@@ -17323,10 +17661,20 @@ msgid "_Junk List"
 msgstr "_Список спама"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr "Отзыв сообщения"
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr "Отзыв сообщения может повлечь за собой его удаление из почтового ящика получателя. Вы действительно хотите отозвать сообщение?"
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr "Сообщение было успешно отозвано"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "Отозвать сообщение"
 
@@ -17334,12 +17682,6 @@ msgstr "Отозвать сообщение"
 msgid "Add Send Options to groupwise messages"
 msgstr "Добавить Параметры Отправки к сообщениям groupwise"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "Параметры отправки"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Модуль для поддержки функций учётных записей Groupwise."
@@ -17389,10 +17731,10 @@ msgstr "Учётная запись уже существует"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
 msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
 msgstr ""
-"Регистрация в прокси под «{0}» не удалась. Проверьте идентификатор "
+"Регистрация в прокси под именем «{0}» не удалась. Проверьте идентификатор "
 "электронной почты и попробуйте ещё раз."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
@@ -17400,15 +17742,18 @@ msgid "This is a recurring meeting"
 msgstr "Это повторяющаяся встреча"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-msgid "What would you like to {0}?"
-msgstr "Что вы хотели бы для {0}?"
+msgid "Would you like to accept it?"
+msgstr "Принять?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
-msgstr ""
-"Вы не можете использовать эту папку совместно с указанным пользователем «{0}»"
+msgid "Would you like to decline it?"
+msgstr "Отклонить?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "Вы не можете использовать эту папку совместно с указанным пользователем «{0}»"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "You have to specify a user name whom you want to add to the list"
 msgstr "Вы должны указать имя пользователя, которого хотите добавить в список"
 
@@ -17843,8 +18188,7 @@ msgstr "Невозможно отправить уведомление об от
 
 #: ../plugins/itip-formatter/itip-formatter.c:1219
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr ""
-"Статус участника не может быть обновлён из-за неверного текущего статуса"
+msgstr "Статус участника не может быть обновлён из-за неверного текущего статуса"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1246
 #, c-format
@@ -17921,31 +18265,31 @@ msgstr ""
 "Чтобы обработать все эти элементы, файл должен быть сохранен и календарь "
 "должен быть импортирован"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2147
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "Эта встреча повторяется"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2150
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "Эта задача повторяется"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2153
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "Эта заметка повторяется"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2382
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "_Удалить сообщение после действия"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2392
-#: ../plugins/itip-formatter/itip-formatter.c:2424
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "Поиск конфликтов"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2407
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Выберите календари для поиска конфликтующих собраний"
 
@@ -18146,13 +18490,11 @@ msgstr "<b>%s</b> желает добавить к существующему с
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
-msgstr ""
-"<b>%s</b> через %s желает получить последнюю информацию о следующем собрании:"
+msgstr "<b>%s</b> через %s желает получить последнюю информацию о следующем собрании:"
 
 #: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> желает получить последнюю информацию о следующем собрании:"
 
 #: ../plugins/itip-formatter/itip-view.c:387
@@ -18250,8 +18592,7 @@ msgstr ""
 
 #: ../plugins/itip-formatter/itip-view.c:475
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
+msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> через %s вернул следующий ответ на назначенную задачу:"
 
 #: ../plugins/itip-formatter/itip-view.c:477
@@ -18271,8 +18612,7 @@ msgstr "<b>%s</b> отменил следующую назначенную за�
 
 #: ../plugins/itip-formatter/itip-view.c:487
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> через %s предложил следующие изменения назначения задачи:"
 
 #: ../plugins/itip-formatter/itip-view.c:489
@@ -18375,42 +18715,42 @@ msgid "_Update"
 msgstr "_Обновить"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1010
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "Время начала:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "Время завершения:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1035
-#: ../plugins/itip-formatter/itip-view.c:1085
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "Комментарий:"
 
-#: ../plugins/itip-formatter/itip-view.c:1071
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "Send _reply to sender"
 msgstr "Ответить отп_равителю"
 
-#: ../plugins/itip-formatter/itip-view.c:1099
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Send _updates to attendees"
 msgstr "Отправить о_бновления к участникам"
 
-#: ../plugins/itip-formatter/itip-view.c:1108
+#: ../plugins/itip-formatter/itip-view.c:1110
 msgid "_Apply to all instances"
 msgstr "П_рименить ко всем записям"
 
-#: ../plugins/itip-formatter/itip-view.c:1117
+#: ../plugins/itip-formatter/itip-view.c:1119
 msgid "Show time as _free"
 msgstr "Показать время как _свободное"
 
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "_Задачи :"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "Заметки :"
 
@@ -18433,8 +18773,7 @@ msgid "This meeting has been delegated"
 msgstr "Это собрание было поручено"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 "Этот ответ пришел не от текущего участника. Добавить отправителя как "
 "участника?"
@@ -18473,7 +18812,8 @@ msgstr "Генерирует сообщение D-BUS при приходе но
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid ""
-"If true, then beep, otherwise will play sound file when new messages arrive."
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr ""
 "Если этот ключ установлен, то подавать гудок, иначе проигрывать звуковой "
 "файл при поступлении новых сообщений."
@@ -18492,8 +18832,7 @@ msgstr "Всплывающие сообщения вместе со значко
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
-msgstr ""
-"Извещает пользователя о появлении новой почты значком в области уведомлений."
+msgstr "Извещает пользователя о появлении новой почты значком в области уведомлений."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
@@ -18513,8 +18852,7 @@ msgstr ""
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether show message over the icon when new messages arrive."
-msgstr ""
-"Надо ли показывать сообщение над значком при поступлении новых сообщений."
+msgstr "Надо ли показывать сообщение над значком при поступлении новых сообщений."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether the icon should blink or not."
@@ -18524,12 +18862,20 @@ msgstr "Должен ли значёк мигать или нет."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Надо ли оповещать о новых сообщениях только в папке Входящие."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "Генерировать сообщение D-Bus"
 
+#: ../plugins/mail-notification/mail-notification.c:378
+msgid "Evolution's Mail Notification"
+msgstr "Уведомление о новой почте Evolution"
+
+#: ../plugins/mail-notification/mail-notification.c:399
+msgid "Mail Notification Properties"
+msgstr "Свойства уведомления о новой почте"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18547,7 +18893,7 @@ msgstr[2] ""
 "Вы получили %d новых сообщений\n"
 "в %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:463
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18555,48 +18901,48 @@ msgstr[0] "Вы получили %d новое сообщение."
 msgstr[1] "Вы получили %d новых сообщения."
 msgstr[2] "Вы получили %d новых сообщений."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
 msgid "New email"
 msgstr "Новое письмо"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:542
 msgid "Show icon in _notification area"
 msgstr "Пока_зывать значок в области уведомлений"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:545
 msgid "B_link icon in notification area"
 msgstr "Мер_цать значком в области уведомлений"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:547
 msgid "Popup _message together with the icon"
 msgstr "Показ_ывать всплывающее сообщение вместе со значком"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:728
 msgid "_Play sound when new messages arrive"
 msgstr "_Воспроизводить звук при приходе новой почты"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "_Beep"
 msgstr "По_давать гудок"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:735
 msgid "Play _sound file"
 msgstr "Про_игрывать звуковой файл"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Specify _filename:"
 msgstr "Имя _файла:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Select sound file"
 msgstr "Выбрать звуковой файл"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Pl_ay"
 msgstr "Вос_произвести"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:805
 msgid "Notify new messages for _Inbox only"
 msgstr "Опове_щать о новых сообщениях только во «Входящих»"
 
@@ -18645,8 +18991,7 @@ msgstr ""
 msgid ""
 "A plugin which allows the creation of tasks from the contents of a mail "
 "message."
-msgstr ""
-"Модуль, который позволяет создание задач из содержимого почтового сообщения."
+msgstr "Модуль, который позволяет создание задач из содержимого почтового сообщения."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
@@ -18683,8 +19028,7 @@ msgid "Mailing _List"
 msgstr "Список _рассылки"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
 msgstr ""
 "Предоставляет действия для основных команд списков рассылки (подписка, "
 "отписка, ...)."
@@ -18769,8 +19113,7 @@ msgstr ""
 msgid ""
 "This message does not contain the header information required for this "
 "action."
-msgstr ""
-"Заголовок сообщения не содержит информации, необходимой для этого действия."
+msgstr "Заголовок сообщения не содержит информации, необходимой для этого действия."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
@@ -18786,8 +19129,7 @@ msgstr "Связаться с _владельцем списка"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
-msgstr ""
-"Связаться с владельцем списка рассылки, которому принадлежит это сообщение"
+msgstr "Связаться с владельцем списка рассылки, которому принадлежит это сообщение"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get List _Archive"
@@ -18809,8 +19151,7 @@ msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
-msgstr ""
-"Опубликовать сообщение в списке рассылки, которому принадлежит это сообщение"
+msgstr "Опубликовать сообщение в списке рассылки, которому принадлежит это сообщение"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
 msgid "Subscribe to the mailing list this message belongs to"
@@ -18894,7 +19235,7 @@ msgstr "Модуль для управления другими модулями
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:210
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr "Мeнеджер модулей"
 
@@ -18910,29 +19251,20 @@ msgstr "_Модули"
 msgid "Author(s)"
 msgstr "Автор(ы)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:43
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Описание"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "Настройка"
 
-#: ../plugins/plugin-manager/plugin-manager.c:223
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Примечание: Некоторые изменения не вступят в силу до перезапуска"
 
-#: ../plugins/plugin-manager/plugin-manager.c:245
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
 msgstr "Обзор"
 
-#: ../plugins/plugin-manager/plugin-manager.c:246
-msgid "Configuration"
-msgstr "Настройка"
-
-#: ../plugins/plugin-manager/plugin-manager.c:262
-msgid "There is no configuration option for this plugin."
-msgstr "Этот модуль не имеет настраиваемых параметров."
-
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/plugin-manager/plugin-manager.c:385
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "Модуль"
 
@@ -19085,6 +19417,30 @@ msgstr ""
 "iCal\n"
 "Cвободен/занят"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hello Python"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Тесты загрузчика модулей Python"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Тестовый модуль Python"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Тестовый модуль для загрузчика Python EPlugin."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr "Модуль, который загружает другие модули, написанные на питоне."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "Загрузчик Python"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (встроенный)"
@@ -19176,7 +19532,6 @@ msgid "MIME Type"
 msgstr "Тип MIME"
 
 #: ../plugins/save-attachments/save-attachments.c:347
-#: ../ui/evolution-editor.xml.h:12
 msgid "Save"
 msgstr "Сохранить"
 
@@ -19310,12 +19665,12 @@ msgid "Show _only this Task List"
 msgstr "_Отображать только этот список задач"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that manages the Startup wizard."
-msgstr "Модуль помощника для первоначальной настройки."
+msgid "Guides you through your initial account setup."
+msgstr "Помогает вам выполнить начальную настройку."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "Запуск помощника"
+msgid "Setup Assistant"
+msgstr "Помощник по установке"
 
 #: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
@@ -19382,6 +19737,28 @@ msgstr "Подшивать сообщения по полю «Тема»"
 msgid "F_all back to threading messages by subject"
 msgstr "Вернуться к подшивке сообщений по _теме"
 
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr "Список пар ключевое слово/значение модуля шаблонов для замены в теле сообщения."
+
+#: ../plugins/templates/templates.c:614
+msgid "No title"
+msgstr "Нет заголовка"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Сохранить как _шаблон"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Сохранить как шаблон"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Модуль шаблонов на основе черновиков"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "Простой модуль, использующий ytnef для расшифровки вложений."
@@ -19407,120 +19784,114 @@ msgid "Evolution Test component"
 msgstr "Evolution Test component"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "Строковое описание текущих параметров принтера."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Authenticate proxy server connections"
 msgstr "Авторизоваться при соединении с прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Automatic proxy configuration URL"
 msgstr "URL автоматической настройки прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Версия конфигурации"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Decides whether the crash detection should be run or not."
 msgstr "Определяет, должно ли запускаться обнаружение сбоя."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Ширина боковой панели по умолчанию"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "Высота окна по умолчанию"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "Состояние окна по умолчанию"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "Ширина окна по умолчанию"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr ""
-"Включает настройки прокси для доступа к Интернет по протоколу HTTP/HTTPS."
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "Включает настройки прокси для доступа к Интернет по протоколу HTTP/HTTPS."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy host name"
 msgstr "Узел HTTP прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy password"
 msgstr "Пароль прокси HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy port"
 msgstr "Порт прокси HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy username"
 msgstr "Имя пользователя прокси HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 "Идентификатор или псевдоним компонента, который будет показываться при "
 "запуске по умолчанию."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and locally stored password in .gnome2_private/."
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 "Если true, то соединение с прокси-сервером требует проверки подлинности. Имя "
-"пользователя / пароль определяются при помощи «/apps/evolution/shell/"
+"пользователя / пароль определяются при помощи ключа GConf «/apps/evolution/shell/"
 "network_config/authentication_user» и локально сохраненного пароля  в ."
 "gnome2_private/."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
 msgstr "Версия последней обновленной конфигурации"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Список путей для папок, которые будут синхронизироваться на диск для "
 "автономной работы"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Non-proxy hosts"
 msgstr "Узлы для доступа без прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Пароль для авторизации на прокси."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "Proxy configuration mode"
 msgstr "Режим настройки прокси"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy host name"
 msgstr "Имя узла прокси SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "SOCKS proxy port"
 msgstr "Порт прокси SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy host name"
 msgstr "Имя узла прокси HTTPS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Secure HTTP proxy port"
 msgstr "Порт прокси HTTPS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19532,27 +19903,27 @@ msgstr ""
 "«использовать заданные настройки» и «использовать ресурс для автоматической "
 "конфигурации»."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "Боковая панель видима"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "Пропускать диалог предупреждения о тестовой версии"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
 msgstr "Пропускать диалог предупреждения о восстановлении"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
 msgid "Start in offline mode"
 msgstr "Запуск в автономном режиме"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "Панель состояния видима"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19560,19 +19931,19 @@ msgstr ""
 "Версия конфигурации Evolution, с уровнями major/minor/configuration "
 "(например, «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default height for the main window, in pixels."
 msgstr "Высота основного окна по умолчанию, в пикселах."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "The default width for the main window, in pixels."
 msgstr "Ширина основного окна по умолчанию, в пикселах."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "Ширина боковой панели по умолчанию, в пикселах."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19580,19 +19951,19 @@ msgstr ""
 "Версия последней обновленной версии Evolution, с уровнями major/minor/"
 "configuration (например, «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy HTTP through."
 msgstr "Имя узла прокси протокола HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid "The machine name to proxy secure HTTP through."
 msgstr "Имя узла прокси протокола HTTPS."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy socks through."
 msgstr "Имя узла прокси протокола SOCKS."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -19600,7 +19971,7 @@ msgstr ""
 "Порт на прокси узле, определённом ключом «/apps/evolution/shell/"
 "network_config/http_host»."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -19608,7 +19979,7 @@ msgstr ""
 "Порт на прокси узле, определённом ключом «/apps/evolution/shell/"
 "network_config/secure_host»."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -19616,17 +19987,17 @@ msgstr ""
 "Порт на прокси узле, определённом ключом «/apps/evolution/shell/"
 "network_config/socks_host»."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
-"Стиль кнопок окон. Возможные варианты: «text», «icons», «both», «toolbar». "
-"Если установлено значение «toolbar», стиль кнопок соответствует системным "
+"Стиль кнопок окон. Возможные варианты: «text», «icons», «both», «toolbar». Если "
+"установлено значение «toolbar», стиль кнопок соответствует системным "
 "параметрам среды GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -19638,69 +20009,67 @@ msgstr ""
 "могут исользовать шаблоны как *.foo.com, адресами IP (и IPv4 и IPv6) и "
 "адресами сетей с маской (например, 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "Панель инструментов видимая"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "URL that provides proxy configuration values."
 msgstr "URL для получения параметров настройки прокси."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Use HTTP proxy"
 msgstr "Использовать прокси HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr ""
 "Имя пользователя для прохождения проверки подлинности при подключении к "
 "прокси HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
-"Если этот ключ установлен, Evolution будет запускаться в автономном режиме."
+msgstr "Если этот ключ установлен, Evolution будет запускаться в автономном режиме."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether crash detection should be done or not"
 msgstr "Надо ли проводить обнаружение сбоя"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether or not the window should be maximized."
 msgstr "Должны ли окно быть максимизированным."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "Должна ли боковая панель быть видимой."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the status bar should be visible."
 msgstr "Должна ли панель состояния быть видимой."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
 msgstr "Должна ли панель инструментов быть видимой."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.h:54
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Если этот ключ установлен, диалог предупреждения в тестовых версиях "
 "Evolution не отображается."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in recovery of Evolution is skipped."
 msgstr "Надо ли пропускать диалог предупреждения при восстановлении Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "Должны ли быть видимыми кнопки окон."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Стиль кнопок окон"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Кнопки окон видимы"
 
@@ -19775,29 +20144,9 @@ msgstr "Импорт _одного файла"
 msgid "Evolution Preferences"
 msgstr "Параметры Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Не указано имя папки."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Имя папки не может содержать символ возврата каретки."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Имя папки не может содержать символ \"/\"."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Имя папки не может содержать символ \"#\"."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "\".\" и \"..\" -- зарезервированные имена папок."
-
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:335
+#: ../shell/e-shell-view.c:48 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19822,7 +20171,7 @@ msgstr "Не удалось запустить Bug buddy."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:742
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Valek Filippov <frob@df.ru>\n"
@@ -19830,43 +20179,48 @@ msgstr ""
 "Leonid Kanter <leon@asplinux.ru>\n"
 "Michael Yakhontov <mvy@asplinux.ru>"
 
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Веб-сайт Evolution"
 
-#: ../shell/e-shell-window-commands.c:771
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Произошла ошибка при открытии веб-страницы вопросов."
 
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "Перейти в сетевой режим"
 
-#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Ав_тономная работа"
 
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Перейти в режим работы вне сети"
 
-#: ../shell/e-shell-window.c:384
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:377
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
-"Evolution сейчас в сетевом режиме работы. Нажмите на эту кнопку для перехода "
+"Evolution сейчас подключен к сети.\n"
+"Нажмите на эту кнопку для перехода\n"
 "в автономный режим."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution находится в процессе перехода в автономный режим работы."
 
-#: ../shell/e-shell-window.c:398
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:391
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
-"Evolution сейчас работает в автономном режиме. Нажмите на эту кнопку для "
-"перехода в режим работы в сети."
+"Evolution сейчас работает в автономном режиме.\n"
+"Нажмите на эту кнопку для подключения к сети."
 
-#: ../shell/e-shell-window.c:807
+#: ../shell/e-shell-window.c:780
 #, c-format
 msgid "Switch to %s"
 msgstr "Переключиться в %s"
@@ -19896,9 +20250,9 @@ msgstr "Не удалось зарегистрировать в OAF"
 msgid "Configuration Database not found"
 msgstr "База данных настроек не найдена"
 
-#: ../shell/e-user-creatable-items-handler.c:671
-#: ../shell/e-user-creatable-items-handler.c:681
-#: ../shell/e-user-creatable-items-handler.c:686
+#: ../shell/e-user-creatable-items-handler.c:669
+#: ../shell/e-user-creatable-items-handler.c:679
+#: ../shell/e-user-creatable-items-handler.c:684
 msgid "New"
 msgstr "Создать"
 
@@ -19906,10 +20260,6 @@ msgstr "Создать"
 msgid "New Test"
 msgstr "Новый тест"
 
-#: ../shell/test/evolution-test-component.c:108
-msgid "_Test"
-msgstr "_Тест"
-
 #: ../shell/test/evolution-test-component.c:109
 msgid "Create a new test item"
 msgstr "Создать новый тестовый элемент"
@@ -20484,16 +20834,14 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "У вас есть идентифицирующие вас сертификаты от следующих организаций:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "У вас в файле имеются сертификаты, которые идентифицируют следующих "
 "поставщиков:"
 
 #: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
-msgstr ""
-"У вас в файле имеются сертификаты, которые идентифицируют следующих лиц:"
+msgstr "У вас в файле имеются сертификаты, которые идентифицируют следующих лиц:"
 
 #: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
@@ -20819,7 +21167,7 @@ msgstr "Сохранить контакты из выделенной папки
 msgid "Select All"
 msgstr "Выделить все"
 
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
 msgstr "В_ыделить все"
 
@@ -20888,7 +21236,7 @@ msgstr "_Переместить контакт в..."
 msgid "_Move Folder Contacts To"
 msgstr "Пере_местить папку контактов в"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Создать"
 
@@ -21026,192 +21374,6 @@ msgstr "Рабочая неделя"
 msgid "_Open Appointment"
 msgstr "_Открыть встречу"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Нажмите, чтобы вложить файл"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Нажмите, чтобы закрыть текущее окно"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Нажмите, чтобы сохранить текущее окно"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Нажмите, чтобы просмотреть справку"
-
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "Закрыть"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Копировать выделенный текст в буфер обмена"
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Вырезать выделенный текст в буфер обмена"
-
-#: ../ui/evolution-editor.xml.h:10
-msgid "I_nsert"
-msgstr "_Вставить"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Вставить текст из буфера обмена"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Выделить весь текст"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_Справка"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Параметры"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Событие на весь день"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Событие на весь _день"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "Классифицировать как Конфиденциальное"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "Классифицировать как личное"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "Классифицировать как публичное"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Нажмите, чтобы установить или сбросить сигналы для этого события"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Вставить дополнительные параметры оправки"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Сделать это событие повторяющимся"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "Пу_бличное"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Запросить информацию о занятости для участников"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "Поле «_Должность»"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "Параметры отпра_вки"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Показать время как _занят"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Часовой _пояс"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Переключает отображение поля «Кому»"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Переключает отображение поля «Просьба ответить»"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Переключает отображение поля «Должность»"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Переключает отображение поля «Состояние»"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Переключает отображение часового пояса"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "Переключает отображение категорий"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Переключает, является ли событие событием на весь день"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Переключить отображение времени как «занят»"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Сигналы"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Категории"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Классификация"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Конфиденциальное"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "Cво_боден/Занят"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Личное"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "П_росьба ответить"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Повторение"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "Поле _состояния"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "Поле _типа"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Отменить текущую почтовую операцию"
@@ -21376,8 +21538,7 @@ msgid "Hide _Read Messages"
 msgstr "Скрыть п_рочитанные сообщения"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Скрывать сообщения, помеченные как удалённые, вместо их перечеркивания"
 
 #: ../ui/evolution-mail-list.xml.h:16
@@ -21915,6 +22076,10 @@ msgstr "_Масштаб"
 msgid "_Zoom In"
 msgstr "У_величить"
 
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Закрыть"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Главная панель инструментов"
@@ -21951,22 +22116,6 @@ msgstr "Просмотреть выделенные заметки"
 msgid "_Open Memo"
 msgstr "_Открыть заметку"
 
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Нажмите, чтобы изменить или просмотреть детали состояния задачи"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Подробности состояния"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Часовой пояс"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "_Подробности состояния"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Копировать выделенные задачи"
@@ -22160,50 +22309,54 @@ msgid "View/Hide the Status Bar"
 msgstr "Показать или спрятать строку состояния."
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "Работать _автономно"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_О программе"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Закрыть окно"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "_Забыть пароли"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "_Часто задаваемые вопросы"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "_Скрыть кнопки"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "Только _значки"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Быстрая справка"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "В_ыход"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "Вид _переключателя"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "Параметры _синхронизации..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "_Только текст"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Окно"
 
@@ -22418,37 +22571,10 @@ msgstr "Тип обзора"
 msgid "Type of view:"
 msgstr "Тип обзора:"
 
-#: ../widgets/misc/e-attachment-bar.c:108
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u байт"
-msgstr[1] "%u байта"
-msgstr[2] "%u байт"
-
-#: ../widgets/misc/e-attachment-bar.c:114
-#, c-format
-msgid "%.1f KB"
-msgstr "%.1f КБ"
-
-#: ../widgets/misc/e-attachment-bar.c:117
-#, c-format
-msgid "%.1f MB"
-msgstr "%.1f МБ"
-
-#: ../widgets/misc/e-attachment-bar.c:120
-#, c-format
-msgid "%.1f GB"
-msgstr "%.1f ГБ"
-
-#: ../widgets/misc/e-attachment-bar.c:1168
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Панель вложений"
 
-#: ../widgets/misc/e-attachment-bar.c:1414
-msgid "Recent Docu_ments"
-msgstr "Недавние доку_менты"
-
 #: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
 #: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
@@ -22527,16 +22653,16 @@ msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Минимальная ширина"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Минимальная ширина"
 
@@ -22803,6 +22929,14 @@ msgstr ""
 "Интерактивная карта для выбора часового пояса при помощи мыши. При помощи "
 "клавиатуры можно выбрать часовой пояс из выпадающего списка ниже."
 
+#: ../widgets/misc/e-online-button.c:112
+msgid "Online"
+msgstr "В сети"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr "Состояние кнопки - «в сети»"
+
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Синхронизировать с:"
@@ -22827,61 +22961,61 @@ msgstr "Reflow model"
 msgid "Column width"
 msgstr "Ширина столбца"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "Поиск"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "Нажмите, чтобы изменить тип поиска"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "П_оиск"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "_Найти сейчас"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "О_чистить"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "ID элемента"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Текст"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1009
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "По_казать: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1026
+#: ../widgets/misc/e-search-bar.c:1024
 msgid "Sear_ch: "
 msgstr "_Искать: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1038
+#: ../widgets/misc/e-search-bar.c:1036
 msgid " i_n "
 msgstr " в "
 
-#: ../widgets/misc/e-selection-model-array.c:574
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Строка с курсором"
 
-#: ../widgets/misc/e-selection-model-array.c:581
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Столбец с курсором"
@@ -22922,10 +23056,6 @@ msgstr "<b>Отслеживание состояния</b>"
 msgid "A_uto-delete sent item"
 msgstr "А_втоматически удалять отправленные элементы"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Классификация"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "_Создать отправленный элемент для отслеживания информации"
@@ -23032,14 +23162,14 @@ msgid "_When opened:"
 msgstr "_Когда открыто:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:289
+#: ../widgets/misc/e-task-widget.c:278
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:295
+#: ../widgets/misc/e-task-widget.c:284
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% выполнено)"
@@ -23257,81 +23387,81 @@ msgstr[0] "%s (%d элемент)"
 msgstr[1] "%s (%d элемента)"
 msgstr[2] "%s (%d элементов)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Альтернативные цвета строки"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
 #: ../widgets/table/e-tree.c:3322 ../widgets/table/e-tree.c:3323
 msgid "Horizontal Draw Grid"
 msgstr "Горизонтальная таблица для рисования"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
 #: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "Vertical Draw Grid"
 msgstr "Вертикальная таблица для рисования"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
 #: ../widgets/table/e-tree.c:3334 ../widgets/table/e-tree.c:3335
 msgid "Draw focus"
 msgstr "Фокус рисования"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Режим курсора"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Модель выделения"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3316
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3316
 #: ../widgets/table/e-tree.c:3317
 msgid "Length Threshold"
 msgstr "Порог длины"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3348
 #: ../widgets/table/e-tree.c:3349
 msgid "Uniform row height"
 msgstr "Общая высота строки"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "Заморожена"
 
@@ -23407,24 +23537,24 @@ msgstr "Информация по сортировке"
 msgid "Tree"
 msgstr "Дерево"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Заголовок таблицы"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Модель таблицы"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Строка с курсором"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
 #: ../widgets/table/e-tree.c:3356
 msgid "Always search"
 msgstr "Всегда искать"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Использовать щелчок для добавления"
 
@@ -23543,3 +23673,4 @@ msgstr "Контекст метода ввода (IM)"
 #: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "Обрабатывать всплывающие окна"
+
author	Matthew Barnes <mbarnes@src.gnome.org>	2008-08-08 12:26:12 +0800
committer	Matthew Barnes <mbarnes@src.gnome.org>	2008-08-08 12:26:12 +0800
commit	cea054cd54d84479352a43bbabc19c9ce9af5efb (patch)
tree	ba02763209ba0f22989024004f57689071603ec5 /po
parent	91a6b6899e5568ed34f913bedb538dd6c9e35b32 (diff)
download	gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.gz gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.bz2 gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.lz gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.xz gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.zst gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.zip